From: Argyrios Kyrtzidis <akyrtzi@gmail.com>
Date: Fri, 17 Mar 2017 00:49:42 +0000 (+0000)
Subject: [Serialization] Follow-up to r297972, deserialize name/loc in separate statements... 
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6517d815c03f24d99d43bbb38eb106835a8ace87;p=clang

[Serialization] Follow-up to r297972, deserialize name/loc in separate statements to make sure they deserialize in defined order.

This should fix the windows bots.

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

diff --git a/lib/Serialization/ASTReaderDecl.cpp b/lib/Serialization/ASTReaderDecl.cpp
index a0ca321bc7..5cd59177d7 100644
--- a/lib/Serialization/ASTReaderDecl.cpp
+++ b/lib/Serialization/ASTReaderDecl.cpp
@@ -1124,10 +1124,12 @@ void ASTDeclReader::VisitObjCPropertyDecl(ObjCPropertyDecl *D) {
       (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>());