replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[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.

llvm-svn: 298027
This commit is contained in:
Argyrios Kyrtzidis 2017-03-17 00:49:42 +00:00
parent 2d9c082033
commit c6c4ec8099
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clang/lib/Serialization/ASTReaderDecl.cpp
View File

@ -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>());