Revert 71165. It did more than just revert 71158 and it introduced

several regressions. The problem due to 71158 is now fixed.


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

2 files changed, 1 insertions, 15 deletions

diff --git a/include/llvm/Analysis/DebugInfo.h b/include/llvm/Analysis/DebugInfo.h
index 908379726e..f398fe43e0 100644
--- a/include/llvm/Analysis/DebugInfo.h
+++ b/include/llvm/Analysis/DebugInfo.h
@@ -321,19 +321,6 @@ namespace llvm {
     bool describes(const Function *F);
   };
 
-  /// DIInlinedSubprogram - This is a wrapper for an inlined subprogram.
-  class DIInlinedSubprogram : public DIGlobal {
-  public:
-    explicit DIInlinedSubprogram(GlobalVariable *GV = 0);
-    DICompositeType getType() const { return getFieldAs<DICompositeType>(8); }
-
-    /// Verify - Verify that an inlined subprogram descriptor is well formed.
-    bool Verify() const;
-
-    /// dump - print inlined subprogram.
-    void dump() const;
-  };
-
   /// DIGlobalVariable - This is a wrapper for a global variable.
   class DIGlobalVariable : public DIGlobal {
   public:
@@ -376,7 +363,6 @@ namespace llvm {
   public:
     explicit DIBlock(GlobalVariable *GV = 0);
     
-    DICompileUnit getCompileUnit() const{ return getFieldAs<DICompileUnit>(1); }
     DIDescriptor getContext() const { return getDescriptorField(1); }
   };
 
diff --git a/include/llvm/CodeGen/DwarfWriter.h b/include/llvm/CodeGen/DwarfWriter.h
index 952d9ea84c..facd5f6e6a 100644
--- a/include/llvm/CodeGen/DwarfWriter.h
+++ b/include/llvm/CodeGen/DwarfWriter.h
@@ -91,7 +91,7 @@ public:
   unsigned RecordRegionStart(GlobalVariable *V);
 
   /// RecordRegionEnd - Indicate the end of a region.
-  unsigned RecordRegionEnd(GlobalVariable *V, DISubprogram &SP);
+  unsigned RecordRegionEnd(GlobalVariable *V);
 
   /// getRecordSourceLineCount - Count source lines.
   unsigned getRecordSourceLineCount();