Revert r190269 to fix dragonegg failures.

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

diff --git a/include/llvm/DIBuilder.h b/include/llvm/DIBuilder.h
index 00fcdabc7913a5c99d683afce433b363bca9804c..39ff317a748452474484f2eaa4ec9c8092d6f141 100644 (file)
--- a/include/llvm/DIBuilder.h
+++ b/include/llvm/DIBuilder.h
@@ -191,7 +191,7 @@ namespace llvm {
     /// @param Flags        Flags to encode member attribute, e.g. private
     /// @param Ty           Parent type.
     DIDerivedType
-    createMemberType(DIScope Scope, StringRef Name, DIFile File,
+    createMemberType(DIDescriptor Scope, StringRef Name, DIFile File,
                      unsigned LineNo, uint64_t SizeInBits, uint64_t AlignInBits,
                      uint64_t OffsetInBits, unsigned Flags, DIType Ty);
 

diff --git a/lib/IR/DIBuilder.cpp b/lib/IR/DIBuilder.cpp
index 962b3a96408d48dfe4906566e742285f5c0fed43..c485cc15ecfea46594014b8bb04475abf9de63dd 100644 (file)
--- a/lib/IR/DIBuilder.cpp
+++ b/lib/IR/DIBuilder.cpp
@@ -410,7 +410,7 @@ DIDerivedType DIBuilder::createInheritance(
 
 /// createMemberType - Create debugging information entry for a member.
 DIDerivedType DIBuilder::createMemberType(
-    DIScope Scope, StringRef Name, DIFile File, unsigned LineNumber,
+    DIDescriptor Scope, StringRef Name, DIFile File, unsigned LineNumber,
     uint64_t SizeInBits, uint64_t AlignInBits, uint64_t OffsetInBits,
     unsigned Flags, DIType Ty) {
   // TAG_member is encoded in DIDerivedType format.