[llvm] r190271 - Revert r190269 to fix dragonegg failures.

[Manman Ren]

Author: mren
Date: Sun Sep  8 01:02:56 2013
New Revision: 190271

URL: http://llvm.org/viewvc/llvm-project?rev=190271&view=rev
Log:
Revert r190269 to fix dragonegg failures.

Modified:
    llvm/trunk/include/llvm/DIBuilder.h
    llvm/trunk/lib/IR/DIBuilder.cpp

Modified: llvm/trunk/include/llvm/DIBuilder.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DIBuilder.h?rev=190271&r1=190270&r2=190271&view=diff
==============================================================================
--- llvm/trunk/include/llvm/DIBuilder.h (original)
+++ llvm/trunk/include/llvm/DIBuilder.h Sun Sep  8 01:02:56 2013
@@ -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);
 

Modified: llvm/trunk/lib/IR/DIBuilder.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/DIBuilder.cpp?rev=190271&r1=190270&r2=190271&view=diff
==============================================================================
--- llvm/trunk/lib/IR/DIBuilder.cpp (original)
+++ llvm/trunk/lib/IR/DIBuilder.cpp Sun Sep  8 01:02:56 2013
@@ -410,7 +410,7 @@ DIDerivedType DIBuilder::createInheritan
 
 /// 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.