[llvm] r316358 - Patch in

[Aaron Ballman via llvm-commits]

Did you intend to land this patch? The commit message lacks a bit of
context. ;-)

~Aaron

On Mon, Oct 23, 2017 at 2:11 PM, Mitch Phillips via llvm-commits
<llvm-commits at lists.llvm.org> wrote:
> Author: hctim
> Date: Mon Oct 23 11:11:31 2017
> New Revision: 316358
>
> URL: http://llvm.org/viewvc/llvm-project?rev=316358&view=rev
> Log:
> Patch in
>
> 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=316358&r1=316357&r2=316358&view=diff
> ==============================================================================
> --- llvm/trunk/tools/llvm-cfi-verify/CMakeLists.txt (original)
> +++ llvm/trunk/tools/llvm-cfi-verify/CMakeLists.txt Mon Oct 23 11:11:31 2017
> @@ -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)
>
> 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=316358&r1=316357&r2=316358&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:11:31 2017
> @@ -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
>
> 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=316358&r1=316357&r2=316358&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:11:31 2017
> @@ -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;
>
> 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=316358&r1=316357&r2=316358&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:11:31 2017
> @@ -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()
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits