Temporarily revert r191792 as it is causing some LTO debug failures

on platforms with relocations in debug info and also temporarily
revert r191800 due to conflicts with the revert of r191792.

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

1 files changed, 8 insertions, 14 deletions

diff --git a/include/llvm/DebugInfo.h b/include/llvm/DebugInfo.h
index cd4777d7d6..ecdca49558 100644
--- a/include/llvm/DebugInfo.h
+++ b/include/llvm/DebugInfo.h
@@ -22,7 +22,6 @@
 #include "llvm/ADT/SmallPtrSet.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringRef.h"
-#include "llvm/IR/Metadata.h"
 #include "llvm/Support/Dwarf.h"
 
 namespace llvm {
@@ -207,8 +206,6 @@ namespace llvm {
     /// Gets the parent scope for this scope node or returns a
     /// default constructed scope.
     DIScopeRef getContext() const;
-    /// If the scope node has a name, return that, else return an empty string.
-    StringRef getName() const;
     StringRef getFilename() const;
     StringRef getDirectory() const;
 
@@ -246,16 +243,6 @@ namespace llvm {
              "MDNode in DITypeIdentifierMap should be a DIType.");
       return T(Iter->second);
     }
-    StringRef getName() const {
-      if (!Val)
-        return StringRef();
-
-      if (const MDNode *MD = dyn_cast<MDNode>(Val))
-        return T(MD).getName();
-
-      const MDString *MS = cast<MDString>(Val);
-      return MS->getString();
-    }
     operator Value *() const { return const_cast<Value*>(Val); }
   };
 
@@ -334,6 +321,9 @@ namespace llvm {
       return DbgNode && isType();
     }
 
+    /// isUnsignedDIType - Return true if type encoding is unsigned.
+    bool isUnsignedDIType();
+
     /// replaceAllUsesWith - Replace all uses of debug info referenced by
     /// this descriptor.
     void replaceAllUsesWith(DIDescriptor &D);
@@ -361,7 +351,11 @@ namespace llvm {
   public:
     explicit DIDerivedType(const MDNode *N = 0) : DIType(N) {}
 
-    DITypeRef getTypeDerivedFrom() const { return getFieldAs<DITypeRef>(9); }
+    DIType getTypeDerivedFrom() const { return getFieldAs<DIType>(9); }
+
+    /// getOriginalTypeSize - If this type is derived from a base type then
+    /// return base type size.
+    uint64_t getOriginalTypeSize() const;
 
     /// getObjCProperty - Return property node, if this ivar is
     /// associated with one.