diff options
| author | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2011-12-03 03:49:52 +0000 |
|---|---|---|
| committer | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2011-12-03 03:49:52 +0000 |
| commit | 8bc27822fc867d43399d4474bccbb58b7b7c7ad7 (patch) | |
| tree | c2f70b8b1461eb509604f1538c98e4ec336973de /lib/Serialization/ASTWriterStmt.cpp | |
| parent | d977e6b0eb4c9b57b0aad6e9e0be39cc67b3a8c7 (diff) | |
[PCH] Make sure that the SourceExpr of a OpaqueValueExpr is always initialized
when deserialized, fixing random crashes in libclang.
Also simplifies how OpaqueValueExprs are [de]serialized.
The reader/writer automatically retains pointer equality of sub-statements (when a
statement node is referenced in multiple nodes), so no need to manually handle it.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@145752 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Serialization/ASTWriterStmt.cpp')
| -rw-r--r-- | lib/Serialization/ASTWriterStmt.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/lib/Serialization/ASTWriterStmt.cpp b/lib/Serialization/ASTWriterStmt.cpp index e3311e9d90..9f976f4a10 100644 --- a/lib/Serialization/ASTWriterStmt.cpp +++ b/lib/Serialization/ASTWriterStmt.cpp @@ -750,8 +750,6 @@ void ASTStmtWriter::VisitPseudoObjectExpr(PseudoObjectExpr *E) { for (PseudoObjectExpr::semantics_iterator i = E->semantics_begin(), e = E->semantics_end(); i != e; ++i) { Writer.AddStmt(*i); - if (OpaqueValueExpr *OVE = dyn_cast<OpaqueValueExpr>(*i)) - Writer.AddStmt(OVE->getSourceExpr()); } Code = serialization::EXPR_PSEUDO_OBJECT; @@ -1381,7 +1379,7 @@ void ASTStmtWriter::VisitMaterializeTemporaryExpr(MaterializeTemporaryExpr *E) { void ASTStmtWriter::VisitOpaqueValueExpr(OpaqueValueExpr *E) { VisitExpr(E); - Record.push_back(Writer.getOpaqueValueID(E)); + Writer.AddStmt(E->getSourceExpr()); Writer.AddSourceLocation(E->getLocation(), Record); Code = serialization::EXPR_OPAQUE_VALUE; } @@ -1468,12 +1466,6 @@ void ASTWriter::ClearSwitchCaseIDs() { SwitchCaseIDs.clear(); } -unsigned ASTWriter::getOpaqueValueID(OpaqueValueExpr *e) { - unsigned &entry = OpaqueValues[e]; - if (!entry) entry = OpaqueValues.size(); - return entry; -} - /// \brief Write the given substatement or subexpression to the /// bitstream. void ASTWriter::WriteSubStmt(Stmt *S, |