[llvm] 882f589 - Revert "[AssumeBundles] Move to IR so it can be used by Analysis"

[Jonas Devlieghere via llvm-commits]

Author: Jonas Devlieghere
Date: 2020-03-09T09:02:47-07:00
New Revision: 882f589e20d65f9e8b754852cec1086d29a5f8a6

URL: https://github.com/llvm/llvm-project/commit/882f589e20d65f9e8b754852cec1086d29a5f8a6
DIFF: https://github.com/llvm/llvm-project/commit/882f589e20d65f9e8b754852cec1086d29a5f8a6.diff

LOG: Revert "[AssumeBundles] Move to IR so it can be used by Analysis"

This breaks the modules build:

http://green.lab.llvm.org/green/job/clang-stage2-Rthinlto/
http://green.lab.llvm.org/green/view/LLDB/job/lldb-cmake/

This reverts commit 57c964aaa76bfaa908398fbd9d8c9d6d19856859.

Added: 
    llvm/include/llvm/Transforms/Utils/KnowledgeRetention.h
    llvm/lib/Transforms/Utils/KnowledgeRetention.cpp
    llvm/test/Transforms/Util/assume-builder.ll
    llvm/unittests/Transforms/Utils/KnowledgeRetentionTest.cpp

Modified: 
    llvm/lib/IR/CMakeLists.txt
    llvm/lib/Passes/PassBuilder.cpp
    llvm/lib/Transforms/Utils/CMakeLists.txt
    llvm/unittests/IR/CMakeLists.txt
    llvm/unittests/Transforms/Utils/CMakeLists.txt

Removed: 
    llvm/include/llvm/IR/KnowledgeRetention.h
    llvm/lib/IR/KnowledgeRetention.cpp
    llvm/test/IR/assume-builder.ll
    llvm/unittests/IR/KnowledgeRetentionTest.cpp


################################################################################
diff  --git a/llvm/include/llvm/IR/KnowledgeRetention.h b/llvm/include/llvm/Transforms/Utils/KnowledgeRetention.h
similarity index 100%
rename from llvm/include/llvm/IR/KnowledgeRetention.h
rename to llvm/include/llvm/Transforms/Utils/KnowledgeRetention.h

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

diff  --git a/llvm/lib/Passes/PassBuilder.cpp b/llvm/lib/Passes/PassBuilder.cpp
index 32d0a380ae3a..a6a2a78f1c74 100644
--- a/llvm/lib/Passes/PassBuilder.cpp
+++ b/llvm/lib/Passes/PassBuilder.cpp
@@ -59,7 +59,6 @@
 #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"
@@ -180,6 +179,7 @@
 #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
index 56e5071b2e3f..24a5202c9f3d 100644
--- a/llvm/lib/Transforms/Utils/CMakeLists.txt
+++ b/llvm/lib/Transforms/Utils/CMakeLists.txt
@@ -29,6 +29,7 @@ add_llvm_component_library(LLVMTransformUtils
   InjectTLIMappings.cpp
   InstructionNamer.cpp
   IntegerDivision.cpp
+  KnowledgeRetention.cpp
   LCSSA.cpp
   LibCallsShrinkWrap.cpp
   Local.cpp

diff  --git a/llvm/lib/IR/KnowledgeRetention.cpp b/llvm/lib/Transforms/Utils/KnowledgeRetention.cpp
similarity index 99%
rename from llvm/lib/IR/KnowledgeRetention.cpp
rename to llvm/lib/Transforms/Utils/KnowledgeRetention.cpp
index 7be93659196b..963bd22ee006 100644
--- a/llvm/lib/IR/KnowledgeRetention.cpp
+++ b/llvm/lib/Transforms/Utils/KnowledgeRetention.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/IR/KnowledgeRetention.h"
+#include "llvm/Transforms/Utils/KnowledgeRetention.h"
 #include "llvm/ADT/DenseSet.h"
 #include "llvm/IR/InstIterator.h"
 #include "llvm/IR/IntrinsicInst.h"

diff  --git a/llvm/test/IR/assume-builder.ll b/llvm/test/Transforms/Util/assume-builder.ll
similarity index 100%
rename from llvm/test/IR/assume-builder.ll
rename to llvm/test/Transforms/Util/assume-builder.ll

diff  --git a/llvm/unittests/IR/CMakeLists.txt b/llvm/unittests/IR/CMakeLists.txt
index 9dba01db1d11..3ef7cee98dcd 100644
--- a/llvm/unittests/IR/CMakeLists.txt
+++ b/llvm/unittests/IR/CMakeLists.txt
@@ -24,7 +24,6 @@ add_llvm_unittest(IRTests
   IRBuilderTest.cpp
   InstructionsTest.cpp
   IntrinsicsTest.cpp
-  KnowledgeRetentionTest.cpp
   LegacyPassManagerTest.cpp
   MDBuilderTest.cpp
   ManglerTest.cpp

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

diff  --git a/llvm/unittests/IR/KnowledgeRetentionTest.cpp b/llvm/unittests/Transforms/Utils/KnowledgeRetentionTest.cpp
similarity index 99%
rename from llvm/unittests/IR/KnowledgeRetentionTest.cpp
rename to llvm/unittests/Transforms/Utils/KnowledgeRetentionTest.cpp
index 46f8c9346d6b..ed37e9c76858 100644
--- a/llvm/unittests/IR/KnowledgeRetentionTest.cpp
+++ b/llvm/unittests/Transforms/Utils/KnowledgeRetentionTest.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/IR/KnowledgeRetention.h"
+#include "llvm/Transforms/Utils/KnowledgeRetention.h"
 #include "llvm/AsmParser/Parser.h"
 #include "llvm/IR/CallSite.h"
 #include "llvm/IR/LLVMContext.h"