Oops - moved slightly too many things from Scalar to Utils. Move LoopSimplifyCFG things back

llvm-svn: 328720

llvm/include/llvm/Transforms/Scalar.h

@@ -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

llvm/include/llvm/Transforms/Utils.h

@@ -110,13 +110,6 @@ FunctionPass *createPromoteMemoryToRegisterPass();
 Pass *createLoopSimplifyPass();
 extern char &LoopSimplifyID;
 
-//===----------------------------------------------------------------------===//
-//
-// LoopSimplifyCFG - This pass performs basic CFG simplification on loops,
-// primarily to help other loop passes.
-//
-Pass *createLoopSimplifyCFGPass();
-
 //===----------------------------------------------------------------------===//
 //
 // InstructionSimplifier - Remove redundant instructions.

llvm/lib/Transforms/Scalar/Scalar.cpp

@@ -102,6 +102,10 @@ void llvm::initializeScalarOpts(PassRegistry &Registry) {
   initializePostInlineEntryExitInstrumenterPass(Registry);
 }
 
+void LLVMAddLoopSimplifyCFGPass(LLVMPassManagerRef PM) {
+  unwrap(PM)->add(createLoopSimplifyCFGPass());
+}
+
 void LLVMInitializeScalarOpts(LLVMPassRegistryRef R) {
   initializeScalarOpts(*unwrap(R));
 }

llvm/lib/Transforms/Utils/Utils.cpp

@@ -46,10 +46,6 @@ void LLVMInitializeTransformUtils(LLVMPassRegistryRef R) {
   initializeTransformUtils(*unwrap(R));
 }
 
-void LLVMAddLoopSimplifyCFGPass(LLVMPassManagerRef PM) {
-  unwrap(PM)->add(createLoopSimplifyCFGPass());
-}
-
 void LLVMAddLowerSwitchPass(LLVMPassManagerRef PM) {
   unwrap(PM)->add(createLowerSwitchPass());
 }