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

[Argyrios Kyrtzidis via cfe-commits]

Author: akirtzidis
Date: Thu Mar 16 19:49:42 2017
New Revision: 298027

URL: http://llvm.org/viewvc/llvm-project?rev=298027&view=rev
Log:
[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.

Modified:
    cfe/trunk/lib/Serialization/ASTReaderDecl.cpp

Modified: cfe/trunk/lib/Serialization/ASTReaderDecl.cpp
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTReaderDecl.cpp?rev=298027&r1=298026&r2=298027&view=diff
==============================================================================
--- cfe/trunk/lib/Serialization/ASTReaderDecl.cpp (original)
+++ cfe/trunk/lib/Serialization/ASTReaderDecl.cpp Thu Mar 16 19:49:42 2017
@@ -1124,10 +1124,12 @@ void ASTDeclReader::VisitObjCPropertyDec
       (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>());


_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits