commit d320eeadcb41e4151954ec8e88f5e6109604321f
author swift-ci <swift-ci@users.noreply.github.com> Thu Mar 16 19:02:52 2017 -0700
committer swift-ci <swift-ci@users.noreply.github.com> Thu Mar 16 19:02:52 2017 -0700
tree e5b9b8babef21ee2c2a723690726fa88204f92b2
parent 98641033deaa83b2f58de800ec4cbea41e5173ad
parent 125e75189595059d5c9fd40aa9b860101d8cd12d

Merge remote-tracking branch 'origin/swift-4.0-branch' into stable

lib/Serialization/ASTReaderDecl.cpp

diff --git a/lib/Serialization/ASTReaderDecl.cpp b/lib/Serialization/ASTReaderDecl.cpp
index ec19ea2..1883423 100644
--- a/lib/Serialization/ASTReaderDecl.cpp
+++ b/lib/Serialization/ASTReaderDecl.cpp
@@ -1112,10 +1112,12 @@
       (ObjCPropertyDecl::PropertyAttributeKind)Record.readInt());
   D->setPropertyImplementation(
       (ObjCPropertyDecl::PropertyControl)Record.readInt());
-  D->setGetterName(Record.readDeclarationName().getObjCSelector(),
-                   ReadSourceLocation());
-  D->setSetterName(Record.readDeclarationName().getObjCSelector(),
-                   ReadSourceLocation());
+  DeclarationName GetterName = Record.readDeclarationName();
+  SourceLocation GetterLoc = ReadSourceLocation();
+  D->setGetterName(GetterName.getObjCSelector(), GetterLoc);
+  DeclarationName SetterName = Record.readDeclarationName();
+  SourceLocation SetterLoc = ReadSourceLocation();
+  D->setSetterName(SetterName.getObjCSelector(), SetterLoc);
   D->setGetterMethodDecl(ReadDeclAs<ObjCMethodDecl>());
   D->setSetterMethodDecl(ReadDeclAs<ObjCMethodDecl>());
   D->setPropertyIvarDecl(ReadDeclAs<ObjCIvarDecl>());