diff options
| author | Tyker <tyker1@outlook.com> | 2019-11-17 11:41:55 +0100 |
|---|---|---|
| committer | Tyker <tyker1@outlook.com> | 2019-11-19 18:20:45 +0100 |
| commit | b0561b3346e7bf0ae974995ca95b917eebde18e1 (patch) | |
| tree | 959dcae1398035f974b55bbef71fb1b81417be28 /clang/lib/Serialization/ASTReaderStmt.cpp | |
| parent | dd471dbe99a7e017357809151df56f2d4c3e7a31 (diff) | |
| download | bcm5719-llvm-b0561b3346e7bf0ae974995ca95b917eebde18e1.tar.gz bcm5719-llvm-b0561b3346e7bf0ae974995ca95b917eebde18e1.zip | |
[NFC] Refactor representation of materialized temporaries
Summary:
this patch refactor representation of materialized temporaries to prevent an issue raised by rsmith in https://reviews.llvm.org/D63640#inline-612718
Reviewers: rsmith, martong, shafik
Reviewed By: rsmith
Subscribers: thakis, sammccall, ilya-biryukov, rnkovacs, arphaman, cfe-commits
Tags: #clang
Differential Revision: https://reviews.llvm.org/D69360
Diffstat (limited to 'clang/lib/Serialization/ASTReaderStmt.cpp')
| -rw-r--r-- | clang/lib/Serialization/ASTReaderStmt.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/clang/lib/Serialization/ASTReaderStmt.cpp b/clang/lib/Serialization/ASTReaderStmt.cpp index 3fd9fff5add..8837396d03d 100644 --- a/clang/lib/Serialization/ASTReaderStmt.cpp +++ b/clang/lib/Serialization/ASTReaderStmt.cpp @@ -1900,10 +1900,11 @@ void ASTStmtReader::VisitFunctionParmPackExpr(FunctionParmPackExpr *E) { void ASTStmtReader::VisitMaterializeTemporaryExpr(MaterializeTemporaryExpr *E) { VisitExpr(E); - E->State = Record.readSubExpr(); - auto *VD = ReadDeclAs<ValueDecl>(); - unsigned ManglingNumber = Record.readInt(); - E->setExtendingDecl(VD, ManglingNumber); + bool HasMaterialzedDecl = Record.readInt(); + if (HasMaterialzedDecl) + E->State = cast<LifetimeExtendedTemporaryDecl>(Record.readDecl()); + else + E->State = Record.readSubExpr(); } void ASTStmtReader::VisitCXXFoldExpr(CXXFoldExpr *E) { |
