From e140b3d122ec2bf8ac4184ee58dd5dca7af6cff7 Mon Sep 17 00:00:00 2001 From: Mitch Phillips Date: Mon, 23 Oct 2017 18:17:56 +0000 Subject: Accidently merged an incomplete upstream patch in 10e6ee563a6b5ca498f27972ca6dbe6c308f1ac2 - reverting the changes. llvm-svn: 316359 --- llvm/tools/llvm-cfi-verify/lib/CMakeLists.txt | 4 +--- llvm/tools/llvm-cfi-verify/lib/FileAnalysis.h | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'llvm/tools/llvm-cfi-verify/lib') diff --git a/llvm/tools/llvm-cfi-verify/lib/CMakeLists.txt b/llvm/tools/llvm-cfi-verify/lib/CMakeLists.txt index 8cbbc79ceca..814e30a234b 100644 --- a/llvm/tools/llvm-cfi-verify/lib/CMakeLists.txt +++ b/llvm/tools/llvm-cfi-verify/lib/CMakeLists.txt @@ -1,9 +1,7 @@ add_library(LLVMCFIVerify STATIC FileAnalysis.cpp - FileAnalysis.h - GraphBuilder.cpp - GraphBuilder.h) + FileAnalysis.h) llvm_update_compile_flags(LLVMCFIVerify) llvm_map_components_to_libnames(libs diff --git a/llvm/tools/llvm-cfi-verify/lib/FileAnalysis.h b/llvm/tools/llvm-cfi-verify/lib/FileAnalysis.h index 3c24bcda75c..df1ad603b6c 100644 --- a/llvm/tools/llvm-cfi-verify/lib/FileAnalysis.h +++ b/llvm/tools/llvm-cfi-verify/lib/FileAnalysis.h @@ -10,7 +10,6 @@ #ifndef LLVM_CFI_VERIFY_FILE_ANALYSIS_H #define LLVM_CFI_VERIFY_FILE_ANALYSIS_H -#include "llvm/ADT/DenseMap.h" #include "llvm/BinaryFormat/ELF.h" #include "llvm/MC/MCAsmInfo.h" #include "llvm/MC/MCContext.h" @@ -162,7 +161,7 @@ private: // Contains a mapping between a specific address, and a list of instructions // that use this address as a branch target (including call instructions). - DenseMap> StaticBranchTargetings; + std::unordered_map> StaticBranchTargetings; // A list of addresses of indirect control flow instructions. std::set IndirectInstructions; -- cgit v1.2.3