diff --git a/include/llvm/DIBuilder.h b/include/llvm/DIBuilder.h
index 39ff317a748..00fcdabc791 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(DIDescriptor Scope, StringRef Name, DIFile File,
+    createMemberType(DIScope 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 7ac37f45b1a..0c91b126936 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(
-    DIDescriptor Scope, StringRef Name, DIFile File, unsigned LineNumber,
+    DIScope 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.