[cfe-commits] r144626 - in /cfe/trunk: lib/Serialization/ASTWriterStmt.cpp test/PCH/objc_exprs.h

[Argyrios Kyrtzidis]

Author: akirtzidis
Date: Tue Nov 15 00:20:27 2011
New Revision: 144626

URL: http://llvm.org/viewvc/llvm-project?rev=144626&view=rev
Log:
[PCH] When serializing an PseudoObjectExpr or AtomicExpr, the serialization code must be set
otherwise it will crash with asserts on or it will be written as null pointer.

Modified:
    cfe/trunk/lib/Serialization/ASTWriterStmt.cpp
    cfe/trunk/test/PCH/objc_exprs.h

Modified: cfe/trunk/lib/Serialization/ASTWriterStmt.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTWriterStmt.cpp?rev=144626&r1=144625&r2=144626&view=diff
==============================================================================
--- cfe/trunk/lib/Serialization/ASTWriterStmt.cpp (original)
+++ cfe/trunk/lib/Serialization/ASTWriterStmt.cpp Tue Nov 15 00:20:27 2011
@@ -753,6 +753,8 @@
     if (OpaqueValueExpr *OVE = dyn_cast<OpaqueValueExpr>(*i))
       Writer.AddStmt(OVE->getSourceExpr());
   }
+
+  Code = serialization::EXPR_PSEUDO_OBJECT;
 }
 
 void ASTStmtWriter::VisitAtomicExpr(AtomicExpr *E) {
@@ -768,6 +770,8 @@
   }
   Writer.AddSourceLocation(E->getBuiltinLoc(), Record);
   Writer.AddSourceLocation(E->getRParenLoc(), Record);
+
+  Code = serialization::EXPR_ATOMIC;
 }
 
 //===----------------------------------------------------------------------===//

Modified: cfe/trunk/test/PCH/objc_exprs.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/PCH/objc_exprs.h?rev=144626&r1=144625&r2=144626&view=diff
==============================================================================
--- cfe/trunk/test/PCH/objc_exprs.h (original)
+++ cfe/trunk/test/PCH/objc_exprs.h Tue Nov 15 00:20:27 2011
@@ -16,3 +16,11 @@
 
 typedef typeof(itf*) objc_interface_ty;
 typedef typeof(itf<foo>*) objc_qual_interface_ty;
+
+ at interface PP
+ at property (assign) id prop;
+ at end
+
+static inline id getPseudoObject(PP *p) {
+    return p.prop;
+}