[llvm] r328720 - Oops - moved slightly too many things from Scalar to Utils. Move LoopSimplifyCFG things back

[David Blaikie via llvm-commits]

Author: dblaikie
Date: Wed Mar 28 11:03:25 2018
New Revision: 328720

URL: http://llvm.org/viewvc/llvm-project?rev=328720&view=rev
Log:
Oops - moved slightly too many things from Scalar to Utils. Move LoopSimplifyCFG things back

Modified:
    llvm/trunk/include/llvm/Transforms/Scalar.h
    llvm/trunk/include/llvm/Transforms/Utils.h
    llvm/trunk/lib/Transforms/Scalar/Scalar.cpp
    llvm/trunk/lib/Transforms/Utils/Utils.cpp

Modified: llvm/trunk/include/llvm/Transforms/Scalar.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Transforms/Scalar.h?rev=328720&r1=328719&r2=328720&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Transforms/Scalar.h (original)
+++ llvm/trunk/include/llvm/Transforms/Scalar.h Wed Mar 28 11:03:25 2018
@@ -488,6 +488,12 @@ ModulePass *createNameAnonGlobalPass();
 //
 FunctionPass *createLibCallsShrinkWrapPass();
 
+//===----------------------------------------------------------------------===//
+//
+// LoopSimplifyCFG - This pass performs basic CFG simplification on loops,
+// primarily to help other loop passes.
+//
+Pass *createLoopSimplifyCFGPass();
 } // End llvm namespace
 
 #endif

Modified: llvm/trunk/include/llvm/Transforms/Utils.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Transforms/Utils.h?rev=328720&r1=328719&r2=328720&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Transforms/Utils.h (original)
+++ llvm/trunk/include/llvm/Transforms/Utils.h Wed Mar 28 11:03:25 2018
@@ -112,13 +112,6 @@ extern char &LoopSimplifyID;
 
 //===----------------------------------------------------------------------===//
 //
-// LoopSimplifyCFG - This pass performs basic CFG simplification on loops,
-// primarily to help other loop passes.
-//
-Pass *createLoopSimplifyCFGPass();
-
-//===----------------------------------------------------------------------===//
-//
 // InstructionSimplifier - Remove redundant instructions.
 //
 FunctionPass *createInstructionSimplifierPass();

Modified: llvm/trunk/lib/Transforms/Scalar/Scalar.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/Scalar.cpp?rev=328720&r1=328719&r2=328720&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/Scalar.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/Scalar.cpp Wed Mar 28 11:03:25 2018
@@ -102,6 +102,10 @@ void llvm::initializeScalarOpts(PassRegi
   initializePostInlineEntryExitInstrumenterPass(Registry);
 }
 
+void LLVMAddLoopSimplifyCFGPass(LLVMPassManagerRef PM) {
+  unwrap(PM)->add(createLoopSimplifyCFGPass());
+}
+
 void LLVMInitializeScalarOpts(LLVMPassRegistryRef R) {
   initializeScalarOpts(*unwrap(R));
 }

Modified: llvm/trunk/lib/Transforms/Utils/Utils.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/Utils.cpp?rev=328720&r1=328719&r2=328720&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Utils/Utils.cpp (original)
+++ llvm/trunk/lib/Transforms/Utils/Utils.cpp Wed Mar 28 11:03:25 2018
@@ -46,10 +46,6 @@ void LLVMInitializeTransformUtils(LLVMPa
   initializeTransformUtils(*unwrap(R));
 }
 
-void LLVMAddLoopSimplifyCFGPass(LLVMPassManagerRef PM) {
-  unwrap(PM)->add(createLoopSimplifyCFGPass());
-}
-
 void LLVMAddLowerSwitchPass(LLVMPassManagerRef PM) {
   unwrap(PM)->add(createLowerSwitchPass());
 }