From: Mitch Phillips <mitchphillips@outlook.com>
Date: Mon, 23 Oct 2017 18:11:31 +0000 (+0000)
Subject: Patch in
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=10e6ee563a6b5ca498f27972ca6dbe6c308f1ac2;p=llvm

Patch in

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@316358 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/tools/llvm-cfi-verify/CMakeLists.txt b/tools/llvm-cfi-verify/CMakeLists.txt
index bf65cf7785c..ae203e53470 100644
--- a/tools/llvm-cfi-verify/CMakeLists.txt
+++ b/tools/llvm-cfi-verify/CMakeLists.txt
@@ -4,6 +4,7 @@ set(LLVM_LINK_COMPONENTS
   AllTargetsDescs
   AllTargetsDisassemblers
   AllTargetsInfos
+  CFIVerify
   MC
   MCParser
   Object
@@ -11,8 +12,6 @@ set(LLVM_LINK_COMPONENTS
   )
 
 add_llvm_tool(llvm-cfi-verify
-  llvm-cfi-verify.cpp
-  lib/FileAnalysis.cpp
-  )
+  llvm-cfi-verify.cpp)
 
 add_subdirectory(lib)
diff --git a/tools/llvm-cfi-verify/lib/CMakeLists.txt b/tools/llvm-cfi-verify/lib/CMakeLists.txt
index 814e30a234b..8cbbc79ceca 100644
--- a/tools/llvm-cfi-verify/lib/CMakeLists.txt
+++ b/tools/llvm-cfi-verify/lib/CMakeLists.txt
@@ -1,7 +1,9 @@
 add_library(LLVMCFIVerify
   STATIC
   FileAnalysis.cpp
-  FileAnalysis.h)
+  FileAnalysis.h
+  GraphBuilder.cpp
+  GraphBuilder.h)
 
 llvm_update_compile_flags(LLVMCFIVerify)
 llvm_map_components_to_libnames(libs
diff --git a/tools/llvm-cfi-verify/lib/FileAnalysis.h b/tools/llvm-cfi-verify/lib/FileAnalysis.h
index df1ad603b6c..3c24bcda75c 100644
--- a/tools/llvm-cfi-verify/lib/FileAnalysis.h
+++ b/tools/llvm-cfi-verify/lib/FileAnalysis.h
@@ -10,6 +10,7 @@
 #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"
@@ -161,7 +162,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).
-  std::unordered_map<uint64_t, std::vector<uint64_t>> StaticBranchTargetings;
+  DenseMap<uint64_t, std::vector<uint64_t>> StaticBranchTargetings;
 
   // A list of addresses of indirect control flow instructions.
   std::set<uint64_t> IndirectInstructions;
diff --git a/unittests/tools/llvm-cfi-verify/CMakeLists.txt b/unittests/tools/llvm-cfi-verify/CMakeLists.txt
index f370400c630..938b90eb83b 100644
--- a/unittests/tools/llvm-cfi-verify/CMakeLists.txt
+++ b/unittests/tools/llvm-cfi-verify/CMakeLists.txt
@@ -4,6 +4,7 @@ set(LLVM_LINK_COMPONENTS
   AllTargetsDescs
   AllTargetsDisassemblers
   AllTargetsInfos
+  CFIVerify
   MC
   MCParser
   Object
@@ -13,6 +14,6 @@ set(LLVM_LINK_COMPONENTS
 list(FIND LLVM_TARGETS_TO_BUILD "X86" x86_idx)
 if (NOT x86_idx LESS 0)
   add_llvm_unittest(CFIVerifyTests
-    FileAnalysis.cpp)
-  target_link_libraries(CFIVerifyTests LLVMCFIVerify)
+    FileAnalysis.cpp
+    GraphBuilder.cpp)
 endif()