Need only one set of debug info versions enum.

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

3 files changed, 13 insertions, 22 deletions

diff --git a/include/llvm/Analysis/DebugInfo.h b/include/llvm/Analysis/DebugInfo.h
index 29ea8be0c6..3f9f984f41 100644
--- a/include/llvm/Analysis/DebugInfo.h
+++ b/include/llvm/Analysis/DebugInfo.h
@@ -32,15 +32,6 @@ namespace llvm {
   class Instruction;
 
   class DIDescriptor {
-  public:
-    enum {
-      Version7    = 7 << 16,     // Current version of debug information.
-      Version6    = 6 << 16,     // Constant for version 6.
-      Version5    = 5 << 16,     // Constant for version 5.
-      Version4    = 4 << 16,     // Constant for version 4.
-      VersionMask = 0xffff0000   // Mask for version number.
-    };
-
   protected:    
     GlobalVariable *GV;
 
@@ -72,11 +63,11 @@ namespace llvm {
     GlobalVariable *getGV() const { return GV; }
 
     unsigned getVersion() const {
-      return getUnsignedField(0) & VersionMask;
+      return getUnsignedField(0) & LLVMDebugVersionMask;
     }
 
     unsigned getTag() const {
-      return getUnsignedField(0) & ~VersionMask;
+      return getUnsignedField(0) & ~LLVMDebugVersionMask;
     }
 
   };
diff --git a/include/llvm/CodeGen/MachineModuleInfo.h b/include/llvm/CodeGen/MachineModuleInfo.h
index f3961f0587..1ff7ee7d56 100644
--- a/include/llvm/CodeGen/MachineModuleInfo.h
+++ b/include/llvm/CodeGen/MachineModuleInfo.h
@@ -55,17 +55,6 @@ class PointerType;
 class StructType;
 
 //===----------------------------------------------------------------------===//
-// Debug info constants.
-
-enum {
-  LLVMDebugVersion = (7 << 16),         // Current version of debug information.
-  LLVMDebugVersion6 = (6 << 16),        // Constant for version 6.
-  LLVMDebugVersion5 = (5 << 16),        // Constant for version 5.
-  LLVMDebugVersion4 = (4 << 16),        // Constant for version 4.
-  LLVMDebugVersionMask = 0xffff0000     // Mask for version number.
-};
-
-//===----------------------------------------------------------------------===//
 /// SourceLineInfo - This class is used to record source line correspondence.
 ///
 class SourceLineInfo {
diff --git a/include/llvm/Support/Dwarf.h b/include/llvm/Support/Dwarf.h
index 01bfc3f353..7f1677430b 100644
--- a/include/llvm/Support/Dwarf.h
+++ b/include/llvm/Support/Dwarf.h
@@ -18,6 +18,17 @@
 
 namespace llvm {
 
+//===----------------------------------------------------------------------===//
+// Debug info constants.
+
+enum {
+LLVMDebugVersion = (7 << 16),         // Current version of debug information.
+LLVMDebugVersion6 = (6 << 16),        // Constant for version 6.
+LLVMDebugVersion5 = (5 << 16),        // Constant for version 5.
+LLVMDebugVersion4 = (4 << 16),        // Constant for version 4.
+LLVMDebugVersionMask = 0xffff0000     // Mask for version number.
+};
+
 namespace dwarf {
 
 //===----------------------------------------------------------------------===//