From: Manman Ren <manman.ren@gmail.com>
Date: Sun, 8 Sep 2013 06:02:56 +0000 (+0000)
Subject: Revert r190269 to fix dragonegg failures.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c7a25acefa43adba6623b2cc5b456151531dc7f4;p=oota-llvm.git

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 00fcdabc791..39ff317a748 100644
--- 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 962b3a96408..c485cc15ecf 100644
--- 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.