Merge the contents of ChangeAllocations.h into Scalar.h

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@3028 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Transforms/ChangeAllocations.h b/include/llvm/Transforms/ChangeAllocations.h
deleted file mode 100644 (file)
index 1b83741..0000000
--- a/include/llvm/Transforms/ChangeAllocations.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//===- llvm/Transforms/ChangeAllocations.h -----------------------*- C++ -*--=//
-//
-// This file defines two passes that convert malloc and free instructions to
-// calls to and from %malloc & %free function calls.  The LowerAllocations
-// transformation is a target dependant tranformation because it depends on the
-// size of data types and alignment constraints.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TRANSFORMS_CHANGEALLOCATIONS_H
-#define LLVM_TRANSFORMS_CHANGEALLOCATIONS_H
-
-class Pass;
-class TargetData;
-
-Pass *createLowerAllocationsPass(const TargetData &TD);
-Pass *createRaiseAllocationsPass();
-
-#endif

diff --git a/include/llvm/Transforms/Scalar.h b/include/llvm/Transforms/Scalar.h
index 5161ac708ad92161fe00458961d0ebada06e6a8f..b1a4340c1f518833a55138fa9ffeea4c18aafbb2 100644 (file)
--- a/include/llvm/Transforms/Scalar.h
+++ b/include/llvm/Transforms/Scalar.h
@@ -9,6 +9,7 @@
 #define LLVM_TRANSFORMS_SCALAR_H
 
 class Pass;
+class TargetData;
 
 //===----------------------------------------------------------------------===//
 //
@@ -159,6 +160,16 @@ Pass *createReassociatePass();
 Pass *createCFGSimplificationPass();
 
 
+//===----------------------------------------------------------------------===//
+// These two passes convert malloc and free instructions to and from %malloc &
+// %free function calls.  The LowerAllocations transformation is a target
+// dependant tranformation because it depends on the size of data types and
+// alignment constraints.
+//
+Pass *createLowerAllocationsPass(const TargetData &TD);
+Pass *createRaiseAllocationsPass();
+
+
 //===----------------------------------------------------------------------===//
 //
 // These functions removes symbols from functions and modules.