Fixed [AssumeBundles] Move to IR so it can be used by Analysis

This is a recommit of 57c964a after fixing modules build.
llvm · Mar 10, 2020 · a4cde9a · a4cde9a
1 parent 3dabad1
commit a4cde9a
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 5 deletions.
diff --git a/...lvm/Transforms/Utils/KnowledgeRetention.h → llvm/include/llvm/IR/KnowledgeRetention.h b/...lvm/Transforms/Utils/KnowledgeRetention.h → llvm/include/llvm/IR/KnowledgeRetention.h
diff --git a/llvm/include/llvm/module.modulemap b/llvm/include/llvm/module.modulemap
@@ -273,6 +273,7 @@ module LLVM_intrinsic_gen {
   module IR_PatternMatch { header "IR/PatternMatch.h" export * }
   module IR_SafepointIRVerifier { header "IR/SafepointIRVerifier.h" export * }
   module IR_Statepoint { header "IR/Statepoint.h" export * }
+  module IR_KnowledgeRetention { header "IR/KnowledgeRetention.h" export * }
 
   export *
 }

diff --git a/llvm/lib/IR/CMakeLists.txt b/llvm/lib/IR/CMakeLists.txt
@@ -28,6 +28,7 @@ add_llvm_component_library(LLVMCore
   Instruction.cpp
   Instructions.cpp
   IntrinsicInst.cpp
+  KnowledgeRetention.cpp
   LLVMContext.cpp
   LLVMContextImpl.cpp
   LLVMRemarkStreamer.cpp

diff --git a/...b/Transforms/Utils/KnowledgeRetention.cpp → llvm/lib/IR/KnowledgeRetention.cpp b/...b/Transforms/Utils/KnowledgeRetention.cpp → llvm/lib/IR/KnowledgeRetention.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/Transforms/Utils/KnowledgeRetention.h"
+#include "llvm/IR/KnowledgeRetention.h"
 #include "llvm/ADT/DenseSet.h"
 #include "llvm/IR/InstIterator.h"
 #include "llvm/IR/IntrinsicInst.h"

diff --git a/llvm/lib/Passes/PassBuilder.cpp b/llvm/lib/Passes/PassBuilder.cpp
@@ -59,6 +59,7 @@
 #include "llvm/CodeGen/UnreachableBlockElim.h"
 #include "llvm/IR/Dominators.h"
 #include "llvm/IR/IRPrintingPasses.h"
+#include "llvm/IR/KnowledgeRetention.h"
 #include "llvm/IR/PassManager.h"
 #include "llvm/IR/SafepointIRVerifier.h"
 #include "llvm/IR/Verifier.h"
@@ -179,7 +180,6 @@
 #include "llvm/Transforms/Utils/CanonicalizeAliases.h"
 #include "llvm/Transforms/Utils/EntryExitInstrumenter.h"
 #include "llvm/Transforms/Utils/InjectTLIMappings.h"
-#include "llvm/Transforms/Utils/KnowledgeRetention.h"
 #include "llvm/Transforms/Utils/LCSSA.h"
 #include "llvm/Transforms/Utils/LibCallsShrinkWrap.h"
 #include "llvm/Transforms/Utils/LoopSimplify.h"

diff --git a/llvm/lib/Transforms/Utils/CMakeLists.txt b/llvm/lib/Transforms/Utils/CMakeLists.txt
@@ -29,7 +29,6 @@ add_llvm_component_library(LLVMTransformUtils
   InjectTLIMappings.cpp
   InstructionNamer.cpp
   IntegerDivision.cpp
-  KnowledgeRetention.cpp
   LCSSA.cpp
   LibCallsShrinkWrap.cpp
   Local.cpp

diff --git a/llvm/test/Transforms/Util/assume-builder.ll → llvm/test/IR/assume-builder.ll b/llvm/test/Transforms/Util/assume-builder.ll → llvm/test/IR/assume-builder.ll
diff --git a/llvm/unittests/IR/CMakeLists.txt b/llvm/unittests/IR/CMakeLists.txt
@@ -24,6 +24,7 @@ add_llvm_unittest(IRTests
   IRBuilderTest.cpp
   InstructionsTest.cpp
   IntrinsicsTest.cpp
+  KnowledgeRetentionTest.cpp
   LegacyPassManagerTest.cpp
   MDBuilderTest.cpp
   ManglerTest.cpp

diff --git a/...ansforms/Utils/KnowledgeRetentionTest.cpp → llvm/unittests/IR/KnowledgeRetentionTest.cpp b/...ansforms/Utils/KnowledgeRetentionTest.cpp → llvm/unittests/IR/KnowledgeRetentionTest.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/Transforms/Utils/KnowledgeRetention.h"
+#include "llvm/IR/KnowledgeRetention.h"
 #include "llvm/AsmParser/Parser.h"
 #include "llvm/IR/CallSite.h"
 #include "llvm/IR/LLVMContext.h"

diff --git a/llvm/unittests/Transforms/Utils/CMakeLists.txt b/llvm/unittests/Transforms/Utils/CMakeLists.txt
@@ -15,7 +15,6 @@ add_llvm_unittest(UtilsTests
   CodeMoverUtilsTest.cpp
   FunctionComparatorTest.cpp
   IntegerDivisionTest.cpp
-  KnowledgeRetentionTest.cpp
   LocalTest.cpp
   LoopRotationUtilsTest.cpp
   LoopUtilsTest.cpp