12 files changed, 25 insertions, 36 deletions
diff --git a/include/llvm/Optimizations/LevelChange.h b/include/llvm/Optimizations/LevelChange.h
index 128e9e1b21..b68ed765f2 100644
--- a/include/llvm/Optimizations/LevelChange.h
+++ b/include/llvm/Optimizations/LevelChange.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_OPT_LEVELCHANGE_H
 #define LLVM_OPT_LEVELCHANGE_H
 
-#include "llvm/Transforms/Pass.h"
+#include "llvm/Pass.h"
 #include "llvm/Module.h"
 #include "llvm/Method.h"
 
diff --git a/include/llvm/Transforms/Pass.h b/include/llvm/Pass.h
index 259a432634..e357df0037 100644
--- a/include/llvm/Transforms/Pass.h
+++ b/include/llvm/Pass.h
@@ -1,6 +1,6 @@
-//===- llvm/Transforms/Pass.h - Base class for XForm Passes ------*- C++ -*--=//
+//===- llvm/Pass.h - Base class for XForm Passes -----------------*- C++ -*--=//
 //
-// This file defines a marker class that indicates that a specified class is a
+// This file defines a base class that indicates that a specified class is a
 // transformation pass implementation.
 //
 // Pass's are designed this way so that it is possible to apply N passes to a
@@ -30,8 +30,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TRANSFORMS_PASS_H
-#define LLVM_TRANSFORMS_PASS_H
+#ifndef LLVM_PASS_H
+#define LLVM_PASS_H
 
 #include "llvm/Module.h"
 #include "llvm/Method.h"
diff --git a/include/llvm/Transforms/ChangeAllocations.h b/include/llvm/Transforms/ChangeAllocations.h
index 46efa26077..8f53051da3 100644
--- a/include/llvm/Transforms/ChangeAllocations.h
+++ b/include/llvm/Transforms/ChangeAllocations.h
@@ -10,7 +10,7 @@
 #ifndef LLVM_TRANSFORMS_LOWERALLOCATIONS_H
 #define LLVM_TRANSFORMS_LOWERALLOCATIONS_H
 
-#include "llvm/Transforms/Pass.h"
+#include "llvm/Pass.h"
 class TargetData;
 
 class LowerAllocations : public Pass {
diff --git a/include/llvm/Transforms/FunctionInlining.h b/include/llvm/Transforms/FunctionInlining.h
index 373708d6b0..520cc7fe6c 100644
--- a/include/llvm/Transforms/FunctionInlining.h
+++ b/include/llvm/Transforms/FunctionInlining.h
@@ -7,7 +7,7 @@
 #ifndef LLVM_OPT_METHOD_INLINING_H
 #define LLVM_OPT_METHOD_INLINING_H
 
-#include "llvm/Transforms/Pass.h"
+#include "llvm/Pass.h"
 #include "llvm/BasicBlock.h"
 class CallInst;
 
diff --git a/include/llvm/Transforms/HoistPHIConstants.h b/include/llvm/Transforms/HoistPHIConstants.h
index 931269bc0b..65bae751a8 100644
--- a/include/llvm/Transforms/HoistPHIConstants.h
+++ b/include/llvm/Transforms/HoistPHIConstants.h
@@ -9,12 +9,13 @@
 #ifndef LLVM_TRANSFORMS_HOISTPHICONSTANTS_H
 #define LLVM_TRANSFORMS_HOISTPHICONSTANTS_H
 
-#include "llvm/Transforms/Pass.h"
+#include "llvm/Pass.h"
 
 struct HoistPHIConstants : public Pass {
+  // doHoistPHIConstants - Hoist constants out of PHI instructions
+  //
   static bool doHoistPHIConstants(Method *M);
 
-
   virtual bool doPerMethodWork(Method *M) { return doHoistPHIConstants(M); }
 };
 
diff --git a/include/llvm/Transforms/IPO/ConstantMerge.h b/include/llvm/Transforms/IPO/ConstantMerge.h
index e98e375f08..4ebbfd3d93 100644
--- a/include/llvm/Transforms/IPO/ConstantMerge.h
+++ b/include/llvm/Transforms/IPO/ConstantMerge.h
@@ -17,7 +17,7 @@
 #ifndef LLVM_TRANSFORMS_CONSTANTMERGE_H
 #define LLVM_TRANSFORMS_CONSTANTMERGE_H
 
-#include "llvm/Transforms/Pass.h"
+#include "llvm/Pass.h"
 #include <map>
 class ConstPoolVal;
 class GlobalVariable;
diff --git a/include/llvm/Transforms/Instrumentation/TraceValues.h b/include/llvm/Transforms/Instrumentation/TraceValues.h
index 4f9201b5e8..d4e2edd5dd 100644
--- a/include/llvm/Transforms/Instrumentation/TraceValues.h
+++ b/include/llvm/Transforms/Instrumentation/TraceValues.h
@@ -1,21 +1,14 @@
-// $Id$ -*-c++-*-
-//***************************************************************************
-// File:
-//	TraceValues.h
-// 
-// Purpose:
-//      Support for inserting LLVM code to print values at basic block
-//      and method exits.  Also exports functions to create a call
-//      "printf" instruction with one of the signatures listed below.
-// 
-// History:
-//	10/11/01	 -  Vikram Adve  -  Created
-//**************************************************************************/
+//===- llvm/Transforms/Instrumentation/TraceValues.h - Tracing ---*- C++ -*--=//
+//
+// Support for inserting LLVM code to print values at basic block and method
+// exits.
+//
+//===----------------------------------------------------------------------===//
 
 #ifndef LLVM_TRANSFORMS_INSTRUMENTATION_TRACEVALUES_H
 #define LLVM_TRANSFORMS_INSTRUMENTATION_TRACEVALUES_H
 
-#include "llvm/Transforms/Pass.h"
+#include "llvm/Pass.h"
 
 class InsertTraceCode : public Pass {
   bool TraceBasicBlockExits, TraceMethodExits;
@@ -30,13 +23,10 @@ public:
   // 
   // Inserts tracing code for all live values at basic block and/or method exits
   // as specified by `traceBasicBlockExits' and `traceMethodExits'.
-  //--------------------------------------------------------------------------
-
+  //
   static bool doInsertTraceCode(Method *M, bool traceBasicBlockExits,
                                 bool traceMethodExits);
 
-
-
   // doPerMethodWork - This method does the work.  Always successful.
   //
   bool doPerMethodWork(Method *M) {
diff --git a/include/llvm/Transforms/PrintModulePass.h b/include/llvm/Transforms/PrintModulePass.h
index 142c2b08d1..a7a4412076 100644
--- a/include/llvm/Transforms/PrintModulePass.h
+++ b/include/llvm/Transforms/PrintModulePass.h
@@ -8,7 +8,7 @@
 #ifndef LLVM_TRANSFORMS_PRINTMODULE_H
 #define LLVM_TRANSFORMS_PRINTMODULE_H
 
-#include "llvm/Transforms/Pass.h"
+#include "llvm/Pass.h"
 #include "llvm/Assembly/Writer.h"
 #include "llvm/Bytecode/Writer.h"
 
@@ -61,6 +61,7 @@ public:
   
   bool doPassFinalization(Module *M) {
     WriteBytecodeToFile(M, *Out);    
+    return false;
   }
 };
 
diff --git a/include/llvm/Transforms/Scalar/ConstantProp.h b/include/llvm/Transforms/Scalar/ConstantProp.h
index 918ef07270..f094ec5496 100644
--- a/include/llvm/Transforms/Scalar/ConstantProp.h
+++ b/include/llvm/Transforms/Scalar/ConstantProp.h
@@ -7,7 +7,7 @@
 #ifndef LLVM_OPT_CONSTANT_PROPOGATION_H
 #define LLVM_OPT_CONSTANT_PROPOGATION_H
 
-#include "llvm/Transforms/Pass.h"
+#include "llvm/Pass.h"
 class TerminatorInst;
 
 namespace opt {
diff --git a/include/llvm/Transforms/Scalar/DCE.h b/include/llvm/Transforms/Scalar/DCE.h
index 9a7bd6e77b..e7a07ec896 100644
--- a/include/llvm/Transforms/Scalar/DCE.h
+++ b/include/llvm/Transforms/Scalar/DCE.h
@@ -8,7 +8,7 @@
 #ifndef LLVM_OPT_DCE_H
 #define LLVM_OPT_DCE_H
 
-#include "llvm/Transforms/Pass.h"
+#include "llvm/Pass.h"
 
 namespace opt {
 
diff --git a/include/llvm/Transforms/Scalar/InductionVars.h b/include/llvm/Transforms/Scalar/InductionVars.h
index e0c46d85ef..82ec9fcc75 100644
--- a/include/llvm/Transforms/Scalar/InductionVars.h
+++ b/include/llvm/Transforms/Scalar/InductionVars.h
@@ -8,8 +8,7 @@
 #ifndef LLVM_OPT_INDUCTION_VARS_H
 #define LLVM_OPT_INDUCTION_VARS_H
 
-#include "llvm/Transforms/Pass.h"
-#include "llvm/Module.h"
+#include "llvm/Pass.h"
 
 namespace opt {
 
diff --git a/include/llvm/Transforms/Scalar/SymbolStripping.h b/include/llvm/Transforms/Scalar/SymbolStripping.h
index a5540f9869..1feb4381e9 100644
--- a/include/llvm/Transforms/Scalar/SymbolStripping.h
+++ b/include/llvm/Transforms/Scalar/SymbolStripping.h
@@ -8,9 +8,7 @@
 #ifndef LLVM_OPT_SYMBOL_STRIPPING_H
 #define LLVM_OPT_SYMBOL_STRIPPING_H
 
-class Method;
-class Module;
-#include "llvm/Transforms/Pass.h"
+#include "llvm/Pass.h"
 
 namespace opt {