one pass of cleanup over DebugInfo.h. Much more is still needed.

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

include/llvm/Analysis/DebugInfo.h

@@ -17,14 +17,10 @@
 #ifndef LLVM_ANALYSIS_DEBUGINFO_H
 #define LLVM_ANALYSIS_DEBUGINFO_H
 
-#include "llvm/Metadata.h"
+#include "llvm/Metadata.h"  // FIXME: Should not need this.
-#include "llvm/Target/TargetMachine.h"
-#include "llvm/ADT/StringMap.h"
-#include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/SmallPtrSet.h"
-#include "llvm/Support/Dwarf.h"
+#include "llvm/Support/Dwarf.h"  // FIXME: Should not need this.
-#include "llvm/Support/ValueHandle.h"
 
 namespace llvm {
   class BasicBlock;
@@ -42,10 +38,10 @@ namespace llvm {
   class DebugLoc;
   struct DebugLocTracker;
   class Instruction;
-  class LLVMContext;
 
-  /// DIDescriptor - A thin wraper around MDNode to access encoded debug info. This should not
+  /// DIDescriptor - A thin wraper around MDNode to access encoded debug info.
-  /// be stored in a container, because underly MDNode may change in certain situations.
+  /// This should not be stored in a container, because underly MDNode may
+  /// change in certain situations.
   class DIDescriptor {
   protected:
     MDNode *DbgNode;
@@ -86,7 +82,7 @@ namespace llvm {
     }
 
     /// ValidDebugInfo - Return true if N represents valid debug info value.
-    static bool ValidDebugInfo(MDNode *N, CodeGenOpt::Level OptLevel);
+    static bool ValidDebugInfo(MDNode *N, unsigned OptLevel);
 
     /// dump - print descriptor.
     void dump() const;
@@ -694,28 +690,23 @@ bool getLocationInfo(const Value *V, std::string &DisplayName,
 
   /// isValidDebugInfoIntrinsic - Return true if SPI is a valid debug
   /// info intrinsic.
-  bool isValidDebugInfoIntrinsic(DbgStopPointInst &SPI,
+  bool isValidDebugInfoIntrinsic(DbgStopPointInst &SPI, unsigned OptLev);
-                                 CodeGenOpt::Level OptLev);
 
   /// isValidDebugInfoIntrinsic - Return true if FSI is a valid debug
   /// info intrinsic.
-  bool isValidDebugInfoIntrinsic(DbgFuncStartInst &FSI,
+  bool isValidDebugInfoIntrinsic(DbgFuncStartInst &FSI, unsigned OptLev);
-                                 CodeGenOpt::Level OptLev);
 
   /// isValidDebugInfoIntrinsic - Return true if RSI is a valid debug
   /// info intrinsic.
-  bool isValidDebugInfoIntrinsic(DbgRegionStartInst &RSI,
+  bool isValidDebugInfoIntrinsic(DbgRegionStartInst &RSI, unsigned OptLev);
-                                 CodeGenOpt::Level OptLev);
 
   /// isValidDebugInfoIntrinsic - Return true if REI is a valid debug
   /// info intrinsic.
-  bool isValidDebugInfoIntrinsic(DbgRegionEndInst &REI,
+  bool isValidDebugInfoIntrinsic(DbgRegionEndInst &REI, unsigned OptLev);
-                                 CodeGenOpt::Level OptLev);
 
   /// isValidDebugInfoIntrinsic - Return true if DI is a valid debug
   /// info intrinsic.
-  bool isValidDebugInfoIntrinsic(DbgDeclareInst &DI,
+  bool isValidDebugInfoIntrinsic(DbgDeclareInst &DI, unsigned OptLev);
-                                 CodeGenOpt::Level OptLev);
 
   /// ExtractDebugLocation - Extract debug location information
   /// from llvm.dbg.stoppoint intrinsic.

lib/Analysis/DebugInfo.cpp

@@ -13,6 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Analysis/DebugInfo.h"
+#include "llvm/Target/TargetMachine.h"  // FIXME: LAYERING VIOLATION!
 #include "llvm/Constants.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/Intrinsics.h"
@@ -34,7 +35,7 @@ using namespace llvm::dwarf;
 
 /// ValidDebugInfo - Return true if V represents valid debug info value.
 /// FIXME : Add DIDescriptor.isValid()
-bool DIDescriptor::ValidDebugInfo(MDNode *N, CodeGenOpt::Level OptLevel) {
+bool DIDescriptor::ValidDebugInfo(MDNode *N, unsigned OptLevel) {
   if (!N)
     return false;
 
@@ -1395,37 +1396,32 @@ bool getLocationInfo(const Value *V, std::string &DisplayName,
 
   /// isValidDebugInfoIntrinsic - Return true if SPI is a valid debug
   /// info intrinsic.
-  bool isValidDebugInfoIntrinsic(DbgStopPointInst &SPI,
+  bool isValidDebugInfoIntrinsic(DbgStopPointInst &SPI, unsigned OptLev) {
-                                 CodeGenOpt::Level OptLev) {
     return DIDescriptor::ValidDebugInfo(SPI.getContext(), OptLev);
   }
 
   /// isValidDebugInfoIntrinsic - Return true if FSI is a valid debug
   /// info intrinsic.
-  bool isValidDebugInfoIntrinsic(DbgFuncStartInst &FSI,
+  bool isValidDebugInfoIntrinsic(DbgFuncStartInst &FSI, unsigned OptLev) {
-                                 CodeGenOpt::Level OptLev) {
     return DIDescriptor::ValidDebugInfo(FSI.getSubprogram(), OptLev);
   }
 
   /// isValidDebugInfoIntrinsic - Return true if RSI is a valid debug
   /// info intrinsic.
-  bool isValidDebugInfoIntrinsic(DbgRegionStartInst &RSI,
+  bool isValidDebugInfoIntrinsic(DbgRegionStartInst &RSI, unsigned OptLev) {
-                                 CodeGenOpt::Level OptLev) {
     return DIDescriptor::ValidDebugInfo(RSI.getContext(), OptLev);
   }
 
   /// isValidDebugInfoIntrinsic - Return true if REI is a valid debug
   /// info intrinsic.
-  bool isValidDebugInfoIntrinsic(DbgRegionEndInst &REI,
+  bool isValidDebugInfoIntrinsic(DbgRegionEndInst &REI, unsigned OptLev) {
-                                 CodeGenOpt::Level OptLev) {
     return DIDescriptor::ValidDebugInfo(REI.getContext(), OptLev);
   }
 
 
   /// isValidDebugInfoIntrinsic - Return true if DI is a valid debug
   /// info intrinsic.
-  bool isValidDebugInfoIntrinsic(DbgDeclareInst &DI,
+  bool isValidDebugInfoIntrinsic(DbgDeclareInst &DI, unsigned OptLev) {
-                                 CodeGenOpt::Level OptLev) {
     return DIDescriptor::ValidDebugInfo(DI.getVariable(), OptLev);
   }