diff options
| author | Sam McCall <sam.mccall@gmail.com> | 2018-05-30 14:14:58 +0000 |
|---|---|---|
| committer | Sam McCall <sam.mccall@gmail.com> | 2018-05-30 14:14:58 +0000 |
| commit | 5429bd751cc0729a3b2f49d8c346aa288cd8d2fc (patch) | |
| tree | ecb7a8e0a08efc304285a887cc295f5915ffad96 /clang/lib/Serialization/ASTWriterDecl.cpp | |
| parent | 173e225f1c2f601536f2e625c05e46fe99ca22b1 (diff) | |
| download | bcm5719-llvm-5429bd751cc0729a3b2f49d8c346aa288cd8d2fc.tar.gz bcm5719-llvm-5429bd751cc0729a3b2f49d8c346aa288cd8d2fc.zip | |
Revert "Update NRVO logic to support early return"
This reverts commit r333500, which causes stage2 compiler crashes.
llvm-svn: 333547
Diffstat (limited to 'clang/lib/Serialization/ASTWriterDecl.cpp')
| -rw-r--r-- | clang/lib/Serialization/ASTWriterDecl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Serialization/ASTWriterDecl.cpp b/clang/lib/Serialization/ASTWriterDecl.cpp index c1f983e5ce8..cf35a2bc1fc 100644 --- a/clang/lib/Serialization/ASTWriterDecl.cpp +++ b/clang/lib/Serialization/ASTWriterDecl.cpp @@ -918,7 +918,7 @@ void ASTDeclWriter::VisitVarDecl(VarDecl *D) { if (!isa<ParmVarDecl>(D)) { Record.push_back(D->isThisDeclarationADemotedDefinition()); Record.push_back(D->isExceptionVariable()); - Record.push_back(D->getNRVOMode()); + Record.push_back(D->isNRVOVariable()); Record.push_back(D->isCXXForRangeDecl()); Record.push_back(D->isObjCForDecl()); Record.push_back(D->isARCPseudoStrong()); @@ -2031,7 +2031,7 @@ void ASTWriter::WriteDeclAbbrevs() { Abv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 2)); // InitStyle Abv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 1)); // IsThisDeclarationADemotedDefinition Abv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 1)); // isExceptionVariable - Abv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 2)); // NRVOMode + Abv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 1)); // isNRVOVariable Abv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 1)); // isCXXForRangeDecl Abv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 1)); // isObjCForDecl Abv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 1)); // isARCPseudoStrong |
