[llvm] r316359 - Accidently merged an incomplete upstream patch in 10e6ee563a6b5ca498f27972ca6dbe6c308f1ac2 - reverting the changes.
Mitch Phillips via llvm-commits
llvm-commits at lists.llvm.org
Mon Oct 23 11:17:56 PDT 2017
Author: hctim
Date: Mon Oct 23 11:17:56 2017
New Revision: 316359
URL: http://llvm.org/viewvc/llvm-project?rev=316359&view=rev
Log:
Accidently merged an incomplete upstream patch in 10e6ee563a6b5ca498f27972ca6dbe6c308f1ac2 - reverting the changes.
Modified:
llvm/trunk/tools/llvm-cfi-verify/CMakeLists.txt
llvm/trunk/tools/llvm-cfi-verify/lib/CMakeLists.txt
llvm/trunk/tools/llvm-cfi-verify/lib/FileAnalysis.h
llvm/trunk/unittests/tools/llvm-cfi-verify/CMakeLists.txt
Modified: llvm/trunk/tools/llvm-cfi-verify/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-cfi-verify/CMakeLists.txt?rev=316359&r1=316358&r2=316359&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-cfi-verify/CMakeLists.txt (original)
+++ llvm/trunk/tools/llvm-cfi-verify/CMakeLists.txt Mon Oct 23 11:17:56 2017
@@ -4,7 +4,6 @@ set(LLVM_LINK_COMPONENTS
AllTargetsDescs
AllTargetsDisassemblers
AllTargetsInfos
- CFIVerify
MC
MCParser
Object
@@ -12,6 +11,8 @@ set(LLVM_LINK_COMPONENTS
)
add_llvm_tool(llvm-cfi-verify
- llvm-cfi-verify.cpp)
+ llvm-cfi-verify.cpp
+ lib/FileAnalysis.cpp
+ )
add_subdirectory(lib)
Modified: llvm/trunk/tools/llvm-cfi-verify/lib/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-cfi-verify/lib/CMakeLists.txt?rev=316359&r1=316358&r2=316359&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-cfi-verify/lib/CMakeLists.txt (original)
+++ llvm/trunk/tools/llvm-cfi-verify/lib/CMakeLists.txt Mon Oct 23 11:17:56 2017
@@ -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
Modified: llvm/trunk/tools/llvm-cfi-verify/lib/FileAnalysis.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-cfi-verify/lib/FileAnalysis.h?rev=316359&r1=316358&r2=316359&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-cfi-verify/lib/FileAnalysis.h (original)
+++ llvm/trunk/tools/llvm-cfi-verify/lib/FileAnalysis.h Mon Oct 23 11:17:56 2017
@@ -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<uint64_t, std::vector<uint64_t>> StaticBranchTargetings;
+ std::unordered_map<uint64_t, std::vector<uint64_t>> StaticBranchTargetings;
// A list of addresses of indirect control flow instructions.
std::set<uint64_t> IndirectInstructions;
Modified: llvm/trunk/unittests/tools/llvm-cfi-verify/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/tools/llvm-cfi-verify/CMakeLists.txt?rev=316359&r1=316358&r2=316359&view=diff
==============================================================================
--- llvm/trunk/unittests/tools/llvm-cfi-verify/CMakeLists.txt (original)
+++ llvm/trunk/unittests/tools/llvm-cfi-verify/CMakeLists.txt Mon Oct 23 11:17:56 2017
@@ -4,7 +4,6 @@ set(LLVM_LINK_COMPONENTS
AllTargetsDescs
AllTargetsDisassemblers
AllTargetsInfos
- CFIVerify
MC
MCParser
Object
@@ -14,6 +13,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
- GraphBuilder.cpp)
+ FileAnalysis.cpp)
+ target_link_libraries(CFIVerifyTests LLVMCFIVerify)
endif()
More information about the llvm-commits
mailing list