Regularize header file comments

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

45 files changed, 82 insertions, 95 deletions

diff --git a/lib/Analysis/Expressions.cpp b/lib/Analysis/Expressions.cpp
index 7733b81819..6692206089 100644
--- a/lib/Analysis/Expressions.cpp
+++ b/lib/Analysis/Expressions.cpp
@@ -1,4 +1,4 @@
-//===- Expressions.cpp - Expression Analysis Utilities ----------------------=//
+//===- Expressions.cpp - Expression Analysis Utilities --------------------===//
 //
 // This file defines a package of expression analysis utilties:
 //
diff --git a/lib/Analysis/IPA/FindUnsafePointerTypes.cpp b/lib/Analysis/IPA/FindUnsafePointerTypes.cpp
index 5d9745cd7a..3f28a6fb96 100644
--- a/lib/Analysis/IPA/FindUnsafePointerTypes.cpp
+++ b/lib/Analysis/IPA/FindUnsafePointerTypes.cpp
@@ -1,4 +1,4 @@
-//===- FindUnsafePointerTypes.cpp - Check pointer usage safety --------------=//
+//===- FindUnsafePointerTypes.cpp - Check pointer usage safety ------------===//
 //
 // This file defines a pass that can be used to determine, interprocedurally, 
 // which pointer types are accessed unsafely in a program.  If there is an
diff --git a/lib/Analysis/IPA/FindUsedTypes.cpp b/lib/Analysis/IPA/FindUsedTypes.cpp
index 51d1b419f3..78be3221e4 100644
--- a/lib/Analysis/IPA/FindUsedTypes.cpp
+++ b/lib/Analysis/IPA/FindUsedTypes.cpp
@@ -1,4 +1,4 @@
-//===- FindUsedTypes.cpp - Find all Types used by a module ------------------=//
+//===- FindUsedTypes.cpp - Find all Types used by a module ----------------===//
 //
 // This pass is used to seek out all of the types in use by the program.
 //
diff --git a/lib/Analysis/Interval.cpp b/lib/Analysis/Interval.cpp
index b966c99574..1f91fdef54 100644
--- a/lib/Analysis/Interval.cpp
+++ b/lib/Analysis/Interval.cpp
@@ -1,4 +1,4 @@
-//===- Interval.cpp - Interval class code ------------------------*- C++ -*--=//
+//===- Interval.cpp - Interval class code ---------------------------------===//
 //
 // This file contains the definition of the Interval class, which represents a
 // partition of a control flow graph of some kind.
diff --git a/lib/Analysis/IntervalPartition.cpp b/lib/Analysis/IntervalPartition.cpp
index 9b9010f167..eb4975ffda 100644
--- a/lib/Analysis/IntervalPartition.cpp
+++ b/lib/Analysis/IntervalPartition.cpp
@@ -1,4 +1,4 @@
-//===- IntervalPartition.cpp - Interval Partition module code ----*- C++ -*--=//
+//===- IntervalPartition.cpp - Interval Partition module code -------------===//
 //
 // This file contains the definition of the IntervalPartition class, which
 // calculates and represent the interval partition of a function.
@@ -8,8 +8,6 @@
 #include "llvm/Analysis/IntervalIterator.h"
 #include "Support/STLExtras.h"
 
-using std::make_pair;
-
 static RegisterAnalysis<IntervalPartition>
 X("intervals", "Interval Partition Construction", true);
 
@@ -39,7 +37,7 @@ void IntervalPartition::addIntervalToPartition(Interval *I) {
   // Add mappings for all of the basic blocks in I to the IntervalPartition
   for (Interval::node_iterator It = I->Nodes.begin(), End = I->Nodes.end();
        It != End; ++It)
-    IntervalMap.insert(make_pair(*It, I));
+    IntervalMap.insert(std::make_pair(*It, I));
 }
 
 // updatePredecessors - Interval generation only sets the successor fields of
diff --git a/lib/Analysis/LiveVar/BBLiveVar.h b/lib/Analysis/LiveVar/BBLiveVar.h
index d9006290c9..88e99a804e 100644
--- a/lib/Analysis/LiveVar/BBLiveVar.h
+++ b/lib/Analysis/LiveVar/BBLiveVar.h
@@ -1,4 +1,4 @@
-//===-- BBLiveVar.h - Live Variable Analysis for a BasicBlock ----*- C++ -*--=//
+//===-- BBLiveVar.h - Live Variable Analysis for a BasicBlock ---*- C++ -*-===//
 //
 // This is a BasicBlock annotation class that is used by live var analysis to
 // hold data flow information for a basic block.
diff --git a/lib/Analysis/LoopInfo.cpp b/lib/Analysis/LoopInfo.cpp
index e92f10d49c..410a012382 100644
--- a/lib/Analysis/LoopInfo.cpp
+++ b/lib/Analysis/LoopInfo.cpp
@@ -1,4 +1,4 @@
-//===- LoopInfo.cpp - Natural Loop Calculator -------------------------------=//
+//===- LoopInfo.cpp - Natural Loop Calculator -----------------------------===//
 //
 // This file defines the LoopInfo class that is used to identify natural loops
 // and determine the loop depth of various nodes of the CFG.  Note that the
diff --git a/lib/AsmParser/ParserInternals.h b/lib/AsmParser/ParserInternals.h
index 667c08b242..47696289da 100644
--- a/lib/AsmParser/ParserInternals.h
+++ b/lib/AsmParser/ParserInternals.h
@@ -1,4 +1,4 @@
-//===-- ParserInternals.h - Definitions internal to the parser ---*- C++ -*--=//
+//===-- ParserInternals.h - Definitions internal to the parser --*- C++ -*-===//
 //
 //  This header file defines the various variables that are shared among the 
 //  different components of the parser...
diff --git a/lib/AsmParser/llvmAsmParser.y b/lib/AsmParser/llvmAsmParser.y
index f9c076c7ea..bb556f2eb5 100644
--- a/lib/AsmParser/llvmAsmParser.y
+++ b/lib/AsmParser/llvmAsmParser.y
@@ -1,8 +1,8 @@
-//===-- llvmAsmParser.y - Parser for llvm assembly files ---------*- C++ -*--=//
+//===-- llvmAsmParser.y - Parser for llvm assembly files --------*- C++ -*-===//
 //
 //  This file implements the bison parser for LLVM assembly languages files.
 //
-//===------------------------------------------------------------------------=//
+//===----------------------------------------------------------------------===//
 
 %{
 #include "ParserInternals.h"
diff --git a/lib/Bytecode/Reader/ReaderInternals.h b/lib/Bytecode/Reader/ReaderInternals.h
index 2d75a32131..4d8806a843 100644
--- a/lib/Bytecode/Reader/ReaderInternals.h
+++ b/lib/Bytecode/Reader/ReaderInternals.h
@@ -1,4 +1,4 @@
-//===-- ReaderInternals.h - Definitions internal to the reader ---*- C++ -*--=//
+//===-- ReaderInternals.h - Definitions internal to the reader ------------===//
 //
 //  This header file defines various stuff that is used by the bytecode reader.
 //
diff --git a/lib/Bytecode/Writer/ConstantWriter.cpp b/lib/Bytecode/Writer/ConstantWriter.cpp
index 6e52369b16..539f3cd4df 100644
--- a/lib/Bytecode/Writer/ConstantWriter.cpp
+++ b/lib/Bytecode/Writer/ConstantWriter.cpp
@@ -1,12 +1,8 @@
-//===-- WriteConst.cpp - Functions for writing constants ---------*- C++ -*--=//
+//===-- ConstantWriter.cpp - Functions for writing constants --------------===//
 //
 // This file implements the routines for encoding constants to a bytecode 
 // stream.
 //
-// Note that the performance of this library is not terribly important, because
-// it shouldn't be used by JIT type applications... so it is not a huge focus
-// at least.  :)
-//
 //===----------------------------------------------------------------------===//
 
 #include "WriterInternals.h"
diff --git a/lib/Bytecode/Writer/InstructionWriter.cpp b/lib/Bytecode/Writer/InstructionWriter.cpp
index da32c03e70..e3a8ffd23b 100644
--- a/lib/Bytecode/Writer/InstructionWriter.cpp
+++ b/lib/Bytecode/Writer/InstructionWriter.cpp
@@ -1,12 +1,8 @@
-//===-- WriteInst.cpp - Functions for writing instructions -------*- C++ -*--=//
+//===-- InstructionWriter.cpp - Functions for writing instructions --------===//
 //
 // This file implements the routines for encoding instruction opcodes to a 
 // bytecode stream.
 //
-// Note that the performance of this library is not terribly important, because
-// it shouldn't be used by JIT type applications... so it is not a huge focus
-// at least.  :)
-//
 //===----------------------------------------------------------------------===//
 
 #include "WriterInternals.h"
diff --git a/lib/Bytecode/Writer/SlotCalculator.cpp b/lib/Bytecode/Writer/SlotCalculator.cpp
index 005c5c1658..47191ce72b 100644
--- a/lib/Bytecode/Writer/SlotCalculator.cpp
+++ b/lib/Bytecode/Writer/SlotCalculator.cpp
@@ -1,4 +1,4 @@
-//===-- SlotCalculator.cpp - Calculate what slots values land in ------------=//
+//===-- SlotCalculator.cpp - Calculate what slots values land in ----------===//
 //
 // This file implements a useful analysis step to figure out what numbered 
 // slots values in a program will land in (keeping track of per plane
diff --git a/lib/Bytecode/Writer/Writer.cpp b/lib/Bytecode/Writer/Writer.cpp
index f368637230..413fd293db 100644
--- a/lib/Bytecode/Writer/Writer.cpp
+++ b/lib/Bytecode/Writer/Writer.cpp
@@ -1,4 +1,4 @@
-//===-- Writer.cpp - Library for writing VM bytecode files -------*- C++ -*--=//
+//===-- Writer.cpp - Library for writing VM bytecode files ----------------===//
 //
 // This library implements the functionality defined in llvm/Bytecode/Writer.h
 //
diff --git a/lib/Bytecode/Writer/WriterInternals.h b/lib/Bytecode/Writer/WriterInternals.h
index 20425e0a6c..98fdec2b55 100644
--- a/lib/Bytecode/Writer/WriterInternals.h
+++ b/lib/Bytecode/Writer/WriterInternals.h
@@ -1,4 +1,4 @@
-//===-- WriterInternals.h - Data structures shared by the Writer -*- C++ -*--=//
+//===- WriterInternals.h - Data structures shared by the Writer -*- C++ -*-===//
 //
 // This header defines the interface used between components of the bytecode
 // writer.
diff --git a/lib/CodeGen/InstrSched/SchedGraph.h b/lib/CodeGen/InstrSched/SchedGraph.h
index 4da761f0f8..11a4f877d0 100644
--- a/lib/CodeGen/InstrSched/SchedGraph.h
+++ b/lib/CodeGen/InstrSched/SchedGraph.h
@@ -1,13 +1,11 @@
-//===-- SchedGraph.h - Scheduling Graph --------------------------*- C++ -*--=//
+//===-- SchedGraph.h - Scheduling Graph -------------------------*- C++ -*-===//
 //
-// Purpose:
-//	Scheduling graph based on SSA graph plus extra dependence edges
-//	capturing dependences due to machine resources (machine registers,
-//	CC registers, and any others).
+// This is a scheduling graph based on SSA graph plus extra dependence edges
+// capturing dependences due to machine resources (machine registers, CC
+// registers, and any others).
 // 
-// Strategy:
-//	This graph tries to leverage the SSA graph as much as possible,
-//	but captures the extra dependences through a common interface.
+// This graph tries to leverage the SSA graph as much as possible, but captures
+// the extra dependences through a common interface.
 // 
 //===----------------------------------------------------------------------===//
 
diff --git a/lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp b/lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp
index 5b6fb095a3..49562f49f5 100644
--- a/lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp
+++ b/lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp
@@ -1,4 +1,4 @@
-//===-- ModuloScheduling.cpp - Software Pipeling Approach - SMS --*- C++ -*--=//
+//===-- ModuloScheduling.cpp - Software Pipeling Approach - SMS -----------===//
 //
 // The is a software pipelining pass based on the Swing Modulo Scheduling
 // algorithm (SMS).
diff --git a/lib/Support/Annotation.cpp b/lib/Support/Annotation.cpp
index 9166240b82..1b42aae142 100644
--- a/lib/Support/Annotation.cpp
+++ b/lib/Support/Annotation.cpp
@@ -1,4 +1,4 @@
-//===-- Annotation.cpp - Implement the Annotation Classes --------*- C++ -*--=//
+//===-- Annotation.cpp - Implement the Annotation Classes -----------------===//
 //
 // This file implements the AnnotationManager class.
 //
diff --git a/lib/Target/SparcV9/InstrSched/SchedGraph.h b/lib/Target/SparcV9/InstrSched/SchedGraph.h
index 4da761f0f8..11a4f877d0 100644
--- a/lib/Target/SparcV9/InstrSched/SchedGraph.h
+++ b/lib/Target/SparcV9/InstrSched/SchedGraph.h
@@ -1,13 +1,11 @@
-//===-- SchedGraph.h - Scheduling Graph --------------------------*- C++ -*--=//
+//===-- SchedGraph.h - Scheduling Graph -------------------------*- C++ -*-===//
 //
-// Purpose:
-//	Scheduling graph based on SSA graph plus extra dependence edges
-//	capturing dependences due to machine resources (machine registers,
-//	CC registers, and any others).
+// This is a scheduling graph based on SSA graph plus extra dependence edges
+// capturing dependences due to machine resources (machine registers, CC
+// registers, and any others).
 // 
-// Strategy:
-//	This graph tries to leverage the SSA graph as much as possible,
-//	but captures the extra dependences through a common interface.
+// This graph tries to leverage the SSA graph as much as possible, but captures
+// the extra dependences through a common interface.
 // 
 //===----------------------------------------------------------------------===//
 
diff --git a/lib/Target/SparcV9/LiveVar/BBLiveVar.h b/lib/Target/SparcV9/LiveVar/BBLiveVar.h
index d9006290c9..88e99a804e 100644
--- a/lib/Target/SparcV9/LiveVar/BBLiveVar.h
+++ b/lib/Target/SparcV9/LiveVar/BBLiveVar.h
@@ -1,4 +1,4 @@
-//===-- BBLiveVar.h - Live Variable Analysis for a BasicBlock ----*- C++ -*--=//
+//===-- BBLiveVar.h - Live Variable Analysis for a BasicBlock ---*- C++ -*-===//
 //
 // This is a BasicBlock annotation class that is used by live var analysis to
 // hold data flow information for a basic block.
diff --git a/lib/Target/SparcV9/ModuloScheduling/ModuloScheduling.cpp b/lib/Target/SparcV9/ModuloScheduling/ModuloScheduling.cpp
index 5b6fb095a3..49562f49f5 100644
--- a/lib/Target/SparcV9/ModuloScheduling/ModuloScheduling.cpp
+++ b/lib/Target/SparcV9/ModuloScheduling/ModuloScheduling.cpp
@@ -1,4 +1,4 @@
-//===-- ModuloScheduling.cpp - Software Pipeling Approach - SMS --*- C++ -*--=//
+//===-- ModuloScheduling.cpp - Software Pipeling Approach - SMS -----------===//
 //
 // The is a software pipelining pass based on the Swing Modulo Scheduling
 // algorithm (SMS).
diff --git a/lib/Target/SparcV9/SparcV9RegClassInfo.h b/lib/Target/SparcV9/SparcV9RegClassInfo.h
index 30ec42d764..17e94ae44c 100644
--- a/lib/Target/SparcV9/SparcV9RegClassInfo.h
+++ b/lib/Target/SparcV9/SparcV9RegClassInfo.h
@@ -1,6 +1,6 @@
-//===-- SparcRegClassInfo.h - Register class def'ns for Sparc ----*- C++ -*--=//
+//===-- SparcRegClassInfo.h - Register class def'ns for Sparc ---*- C++ -*-===//
 //
-//  This file defines the register classes used by the Sparc target description.
+// This file defines the register classes used by the Sparc target description.
 //
 //===----------------------------------------------------------------------===//
 
@@ -13,7 +13,6 @@
 // Integer Register Class
 //-----------------------------------------------------------------------------
 
-
 struct SparcIntRegClass : public TargetRegClassInfo {
   SparcIntRegClass(unsigned ID) 
     : TargetRegClassInfo(ID, NumOfAvailRegs, NumOfAllRegs) {  }
diff --git a/lib/Transforms/IPO/MutateStructTypes.cpp b/lib/Transforms/IPO/MutateStructTypes.cpp
index f10bccef9d..91302afbef 100644
--- a/lib/Transforms/IPO/MutateStructTypes.cpp
+++ b/lib/Transforms/IPO/MutateStructTypes.cpp
@@ -1,4 +1,4 @@
-//===- MutateStructTypes.cpp - Change struct defns --------------------------=//
+//===- MutateStructTypes.cpp - Change struct defns ------------------------===//
 //
 // This pass is used to change structure accesses and type definitions in some
 // way.  It can be used to arbitrarily permute structure fields, safely, without
diff --git a/lib/Transforms/IPO/SimpleStructMutation.cpp b/lib/Transforms/IPO/SimpleStructMutation.cpp
index ec1981929e..be36462869 100644
--- a/lib/Transforms/IPO/SimpleStructMutation.cpp
+++ b/lib/Transforms/IPO/SimpleStructMutation.cpp
@@ -1,4 +1,4 @@
-//===- SimpleStructMutation.cpp - Swap structure elements around -*- C++ -*--=//
+//===- SimpleStructMutation.cpp - Swap structure elements around ----------===//
 //
 // This pass does a simple transformation that swaps all of the elements of the
 // struct types in the program around.
diff --git a/lib/Transforms/Instrumentation/EmitFunctions.cpp b/lib/Transforms/Instrumentation/EmitFunctions.cpp
index 4f445bc868..6961c53a71 100644
--- a/lib/Transforms/Instrumentation/EmitFunctions.cpp
+++ b/lib/Transforms/Instrumentation/EmitFunctions.cpp
@@ -1,4 +1,4 @@
-//===-- EmitFunctions.cpp - interface to insert instrumentation --*- C++ -*--=//
+//===-- EmitFunctions.cpp - interface to insert instrumentation -----------===//
 //
 // This inserts a global constant table with function pointers all along
 //
diff --git a/lib/Transforms/Instrumentation/ProfilePaths/CombineBranch.cpp b/lib/Transforms/Instrumentation/ProfilePaths/CombineBranch.cpp
index 16f98e7d08..42fa74c376 100644
--- a/lib/Transforms/Instrumentation/ProfilePaths/CombineBranch.cpp
+++ b/lib/Transforms/Instrumentation/ProfilePaths/CombineBranch.cpp
@@ -1,7 +1,9 @@
-//===-- CombineBranch.cpp ------------------------------------ ---*- C++ -*--=//
+//===-- CombineBranch.cpp -------------------------------------------------===//
+//
 // Pass to instrument loops
 //
 // At every backedge, insert a counter for that backedge and a call function
+//
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Analysis/Dominators.h"
diff --git a/lib/Transforms/Instrumentation/ProfilePaths/Graph.h b/lib/Transforms/Instrumentation/ProfilePaths/Graph.h
index 3c22d627e4..635646298f 100644
--- a/lib/Transforms/Instrumentation/ProfilePaths/Graph.h
+++ b/lib/Transforms/Instrumentation/ProfilePaths/Graph.h
@@ -1,8 +1,7 @@
-//===-- ------------------------llvm/graph.h ---------------------*- C++ -*--=//
+//===-- Graph.h -------------------------------------------------*- C++ -*-===//
 //
-//Header file for Graph: This Graph is used by 
-//PathProfiles class, and is used
-//for detecting proper points in cfg for code insertion 
+// Header file for Graph: This Graph is used by PathProfiles class, and is used
+// for detecting proper points in cfg for code insertion
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxiliary.cpp b/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxiliary.cpp
index 4e7c5847a6..fd44d8eed1 100644
--- a/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxiliary.cpp
+++ b/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxiliary.cpp
@@ -1,8 +1,7 @@
-//===-- GrapAuxiliary.cpp- Auxiliary functions on graph ----------*- C++ -*--=//
+//===- GraphAuxiliary.cpp - Auxiliary functions on graph ------------------===//
 //
-//auxiliary function associated with graph: they
-//all operate on graph, and help in inserting
-//instrumentation for trace generation
+// auxiliary function associated with graph: they all operate on graph, and help
+// in inserting instrumentation for trace generation
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lib/Transforms/Instrumentation/ProfilePaths/InstLoops.cpp b/lib/Transforms/Instrumentation/ProfilePaths/InstLoops.cpp
index 74209b7ea5..d2e8d14e84 100644
--- a/lib/Transforms/Instrumentation/ProfilePaths/InstLoops.cpp
+++ b/lib/Transforms/Instrumentation/ProfilePaths/InstLoops.cpp
@@ -1,7 +1,9 @@
-//===-- InstLoops.cpp ---------------------------------------- ---*- C++ -*--=//
+//===-- InstLoops.cpp -----------------------------------------------------===//
+//
 // Pass to instrument loops
 //
 // At every backedge, insert a counter for that backedge and a call function
+//
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Analysis/Dominators.h"
@@ -27,7 +29,7 @@ enum Color{
   BLACK
 };
 
-namespace{
+namespace {
   typedef std::map<BasicBlock *, BasicBlock *> BBMap;
   struct InstLoops : public FunctionPass {
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
diff --git a/lib/Transforms/Instrumentation/ProfilePaths/ProfilePaths.cpp b/lib/Transforms/Instrumentation/ProfilePaths/ProfilePaths.cpp
index df2b764e7c..7f0bfa8231 100644
--- a/lib/Transforms/Instrumentation/ProfilePaths/ProfilePaths.cpp
+++ b/lib/Transforms/Instrumentation/ProfilePaths/ProfilePaths.cpp
@@ -1,27 +1,27 @@
-//===-- ProfilePaths.cpp - interface to insert instrumentation ---*- C++ -*--=//
+//===-- ProfilePaths.cpp - interface to insert instrumentation --*- C++ -*-===//
 //
-// This inserts instrumentation for counting
-// execution of paths though a given function
-// Its implemented as a "Function" Pass, and called using opt
+// This inserts instrumentation for counting execution of paths though a given
+// function Its implemented as a "Function" Pass, and called using opt
 //
 // This pass is implemented by using algorithms similar to 
 // 1."Efficient Path Profiling": Ball, T. and Larus, J. R., 
-// Proceedings of Micro-29, Dec 1996, Paris, France.
+//    Proceedings of Micro-29, Dec 1996, Paris, France.
 // 2."Efficiently Counting Program events with support for on-line
 //   "queries": Ball T., ACM Transactions on Programming Languages
-//   and systems, Sep 1994.
+//    and systems, Sep 1994.
 //
-// The algorithms work on a Graph constructed over the nodes
-// made from Basic Blocks: The transformations then take place on
-// the constructed graph (implementation in Graph.cpp and GraphAuxiliary.cpp)
-// and finally, appropriate instrumentation is placed over suitable edges.
-// (code inserted through EdgeCode.cpp).
+// The algorithms work on a Graph constructed over the nodes made from Basic
+// Blocks: The transformations then take place on the constructed graph
+// (implementation in Graph.cpp and GraphAuxiliary.cpp) and finally, appropriate
+// instrumentation is placed over suitable edges.  (code inserted through
+// EdgeCode.cpp).
 // 
-// The algorithm inserts code such that every acyclic path in the CFG
-// of a function is identified through a unique number. the code insertion
-// is optimal in the sense that its inserted over a minimal set of edges. Also,
-// the algorithm makes sure than initialization, path increment and counter
-// update can be collapsed into minimum number of edges.
+// The algorithm inserts code such that every acyclic path in the CFG of a
+// function is identified through a unique number. the code insertion is optimal
+// in the sense that its inserted over a minimal set of edges. Also, the
+// algorithm makes sure than initialization, path increment and counter update
+// can be collapsed into minimum number of edges.
+//
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Transforms/Utils/UnifyFunctionExitNodes.h"
diff --git a/lib/Transforms/Instrumentation/ProfilePaths/RetracePath.cpp b/lib/Transforms/Instrumentation/ProfilePaths/RetracePath.cpp
index 0f8382319a..3310488a33 100644
--- a/lib/Transforms/Instrumentation/ProfilePaths/RetracePath.cpp
+++ b/lib/Transforms/Instrumentation/ProfilePaths/RetracePath.cpp
@@ -1,4 +1,4 @@
-//===----Instrumentation/ProfilePaths/RetracePath.cppTrigger.cpp--*- C++ -*--=//
+//===- RetracePath.cpp ----------------------------------------------------===//
 //
 // Retraces a path of BasicBlock, given a path number and a graph!
 //
diff --git a/lib/Transforms/Instrumentation/TraceValues.cpp b/lib/Transforms/Instrumentation/TraceValues.cpp
index 45799727c3..f6bc4ceaac 100644
--- a/lib/Transforms/Instrumentation/TraceValues.cpp
+++ b/lib/Transforms/Instrumentation/TraceValues.cpp
@@ -1,4 +1,4 @@
-//===- TraceValues.cpp - Value Tracing for debugging -------------*- C++ -*--=//
+//===- TraceValues.cpp - Value Tracing for debugging ----------------------===//
 //
 // Support for inserting LLVM code to print values at basic block and function
 // exits.
diff --git a/lib/Transforms/LevelRaise.cpp b/lib/Transforms/LevelRaise.cpp
index fb65398159..b02106a219 100644
--- a/lib/Transforms/LevelRaise.cpp
+++ b/lib/Transforms/LevelRaise.cpp
@@ -1,4 +1,4 @@
-//===- LevelRaise.cpp - Code to change LLVM to higher level -----------------=//
+//===- LevelRaise.cpp - Code to change LLVM to higher level ---------------===//
 //
 // This file implements the 'raising' part of the LevelChange API.  This is
 // useful because, in general, it makes the LLVM code terser and easier to
diff --git a/lib/Transforms/TransformInternals.cpp b/lib/Transforms/TransformInternals.cpp
index 0e143cd8c2..f726e829aa 100644
--- a/lib/Transforms/TransformInternals.cpp
+++ b/lib/Transforms/TransformInternals.cpp
@@ -1,4 +1,4 @@
-//===-- TransformInternals.cpp - Implement shared functions for transforms --=//
+//===- TransformInternals.cpp - Implement shared functions for transforms -===//
 //
 //  This file defines shared functions used by the different components of the
 //  Transforms library.
diff --git a/lib/Transforms/TransformInternals.h b/lib/Transforms/TransformInternals.h
index ac7be3a49f..9ec679031d 100644
--- a/lib/Transforms/TransformInternals.h
+++ b/lib/Transforms/TransformInternals.h
@@ -1,4 +1,4 @@
-//===-- TransformInternals.h - Shared functions for Transforms ---*- C++ -*--=//
+//===-- TransformInternals.h - Shared functions for Transforms --*- C++ -*-===//
 //
 //  This header file declares shared functions used by the different components
 //  of the Transforms library.
diff --git a/lib/VMCore/Function.cpp b/lib/VMCore/Function.cpp
index e9ae634710..d31a69e49a 100644
--- a/lib/VMCore/Function.cpp
+++ b/lib/VMCore/Function.cpp
@@ -1,4 +1,4 @@
-//===-- Function.cpp - Implement the Global object classes -------*- C++ -*--=//
+//===-- Function.cpp - Implement the Global object classes ----------------===//
 //
 // This file implements the Function & GlobalVariable classes for the VMCore
 // library.
diff --git a/lib/VMCore/Instruction.cpp b/lib/VMCore/Instruction.cpp
index a2d0ba9174..e5e6501bd3 100644
--- a/lib/VMCore/Instruction.cpp
+++ b/lib/VMCore/Instruction.cpp
@@ -1,4 +1,4 @@
-//===-- Instruction.cpp - Implement the Instruction class --------*- C++ -*--=//
+//===-- Instruction.cpp - Implement the Instruction class -----------------===//
 //
 // This file implements the Instruction class for the VMCore library.
 //
diff --git a/lib/VMCore/Module.cpp b/lib/VMCore/Module.cpp
index 80460df4d8..77b17674d1 100644
--- a/lib/VMCore/Module.cpp
+++ b/lib/VMCore/Module.cpp
@@ -1,4 +1,4 @@
-//===-- Module.cpp - Implement the Module class ------------------*- C++ -*--=//
+//===-- Module.cpp - Implement the Module class ---------------------------===//
 //
 // This file implements the Module class for the VMCore library.
 //
diff --git a/lib/VMCore/PassManagerT.h b/lib/VMCore/PassManagerT.h
index 9f47665b53..370aa4c42e 100644
--- a/lib/VMCore/PassManagerT.h
+++ b/lib/VMCore/PassManagerT.h
@@ -1,4 +1,4 @@
-//===- PassManagerT.h - Container for Passes ---------------------*- C++ -*--=//
+//===- PassManagerT.h - Container for Passes ------------------------------===//
 //
 // This file defines the PassManagerT class.  This class is used to hold,
 // maintain, and optimize execution of Pass's.  The PassManager class ensures
diff --git a/lib/VMCore/SlotCalculator.cpp b/lib/VMCore/SlotCalculator.cpp
index 005c5c1658..47191ce72b 100644
--- a/lib/VMCore/SlotCalculator.cpp
+++ b/lib/VMCore/SlotCalculator.cpp
@@ -1,4 +1,4 @@
-//===-- SlotCalculator.cpp - Calculate what slots values land in ------------=//
+//===-- SlotCalculator.cpp - Calculate what slots values land in ----------===//
 //
 // This file implements a useful analysis step to figure out what numbered 
 // slots values in a program will land in (keeping track of per plane
diff --git a/lib/VMCore/SymbolTable.cpp b/lib/VMCore/SymbolTable.cpp
index 9def6cb512..6812f699d5 100644
--- a/lib/VMCore/SymbolTable.cpp
+++ b/lib/VMCore/SymbolTable.cpp
@@ -1,4 +1,4 @@
-//===-- SymbolTable.cpp - Implement the SymbolTable class -------------------=//
+//===-- SymbolTable.cpp - Implement the SymbolTable class -----------------===//
 //
 // This file implements the SymbolTable class for the VMCore library.
 //
diff --git a/lib/VMCore/iBranch.cpp b/lib/VMCore/iBranch.cpp
index 3ad36d13ee..a6032ab0fe 100644
--- a/lib/VMCore/iBranch.cpp
+++ b/lib/VMCore/iBranch.cpp
@@ -1,4 +1,4 @@
-//===-- iBranch.cpp - Implement the Branch instruction -----------*- C++ -*--=//
+//===-- iBranch.cpp - Implement the Branch instruction --------------------===//
 //
 // This file implements the 'br' instruction, which can represent either a 
 // conditional or unconditional branch.
diff --git a/lib/VMCore/iCall.cpp b/lib/VMCore/iCall.cpp
index 9144014b76..823def6911 100644
--- a/lib/VMCore/iCall.cpp
+++ b/lib/VMCore/iCall.cpp
@@ -1,4 +1,4 @@
-//===-- iCall.cpp - Implement the call & invoke instructions -----*- C++ -*--=//
+//===-- iCall.cpp - Implement the call & invoke instructions --------------===//
 //
 // This file implements the call and invoke instructions.
 //
diff --git a/lib/VMCore/iSwitch.cpp b/lib/VMCore/iSwitch.cpp
index e1cb00e3ad..0ffe45ff92 100644
--- a/lib/VMCore/iSwitch.cpp
+++ b/lib/VMCore/iSwitch.cpp
@@ -1,4 +1,4 @@
-//===-- iSwitch.cpp - Implement the Switch instruction -----------*- C++ -*--=//
+//===-- iSwitch.cpp - Implement the Switch instruction --------------------===//
 //
 // This file implements the Switch instruction...
 //
diff --git a/utils/TableGen/FileParser.y b/utils/TableGen/FileParser.y
index 728fcf222c..2b434bf8ae 100644
--- a/utils/TableGen/FileParser.y
+++ b/utils/TableGen/FileParser.y
@@ -2,7 +2,7 @@
 //
 //  This file implements the bison parser for Table Generator files...
 //
-//===------------------------------------------------------------------------=//
+//===----------------------------------------------------------------------===//
 
 %{
 #include "Record.h"