Fix <rdar://problem/5979875> clang on xcode: error: use of undeclared identifier 'super'
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@51888 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/clang/AST/ExprObjC.h b/include/clang/AST/ExprObjC.h
index d00cb9a..0118c38 100644
--- a/include/clang/AST/ExprObjC.h
+++ b/include/clang/AST/ExprObjC.h
@@ -335,6 +335,28 @@
static ObjCMessageExpr* CreateImpl(llvm::Deserializer& D, ASTContext& C);
};
+/// ObjCSuperRefExpr - A reference to super.
+class ObjCSuperRefExpr : public Expr {
+ SourceLocation Loc;
+public:
+ ObjCSuperRefExpr(QualType t, SourceLocation l) :
+ Expr(ObjCSuperRefExprClass, t), Loc(l) {}
+
+ virtual SourceRange getSourceRange() const { return SourceRange(Loc); }
+
+ static bool classof(const Stmt *T) {
+ return T->getStmtClass() == ObjCSuperRefExprClass;
+ }
+ static bool classof(const ObjCSuperRefExpr *) { return true; }
+
+ // Iterators
+ virtual child_iterator child_begin();
+ virtual child_iterator child_end();
+
+ virtual void EmitImpl(llvm::Serializer& S) const;
+ static ObjCSuperRefExpr* CreateImpl(llvm::Deserializer& D, ASTContext& C);
+};
+
} // end namespace clang
#endif
diff --git a/include/clang/AST/StmtNodes.def b/include/clang/AST/StmtNodes.def
index 915dc26..d156f92 100644
--- a/include/clang/AST/StmtNodes.def
+++ b/include/clang/AST/StmtNodes.def
@@ -101,12 +101,13 @@
STMT(74, ObjCProtocolExpr , Expr)
STMT(75, ObjCIvarRefExpr , Expr)
STMT(76, ObjCPropertyRefExpr , Expr)
+STMT(77, ObjCSuperRefExpr , Expr)
// Clang Extensions.
-STMT(77, OverloadExpr , Expr)
-STMT(78, ShuffleVectorExpr , Expr)
+STMT(78, OverloadExpr , Expr)
+STMT(79, ShuffleVectorExpr , Expr)
-LAST_EXPR(78)
+LAST_EXPR(79)
#undef STMT
#undef FIRST_STMT
diff --git a/lib/AST/Expr.cpp b/lib/AST/Expr.cpp
index 6b0eb04..357d711 100644
--- a/lib/AST/Expr.cpp
+++ b/lib/AST/Expr.cpp
@@ -1189,7 +1189,7 @@
return reinterpret_cast<Stmt**>(&Base)+1;
}
-// ObjCIvarRefExpr
+// ObjCPropertyRefExpr
Stmt::child_iterator ObjCPropertyRefExpr::child_begin() {
return reinterpret_cast<Stmt**>(&Base);
}
@@ -1198,6 +1198,10 @@
return reinterpret_cast<Stmt**>(&Base)+1;
}
+// ObjCSuperRefExpr
+Stmt::child_iterator ObjCSuperRefExpr::child_begin() { return child_iterator();}
+Stmt::child_iterator ObjCSuperRefExpr::child_end() { return child_iterator(); }
+
// PreDefinedExpr
Stmt::child_iterator PreDefinedExpr::child_begin() { return child_iterator(); }
Stmt::child_iterator PreDefinedExpr::child_end() { return child_iterator(); }
diff --git a/lib/AST/StmtPrinter.cpp b/lib/AST/StmtPrinter.cpp
index d52f48e..a740fac 100644
--- a/lib/AST/StmtPrinter.cpp
+++ b/lib/AST/StmtPrinter.cpp
@@ -476,6 +476,10 @@
OS << Node->getDecl()->getName();
}
+void StmtPrinter::VisitObjCSuperRefExpr(ObjCSuperRefExpr *Node) {
+ OS << "super";
+}
+
void StmtPrinter::VisitObjCIvarRefExpr(ObjCIvarRefExpr *Node) {
if (Node->getBase()) {
PrintExpr(Node->getBase());
diff --git a/lib/AST/StmtSerialization.cpp b/lib/AST/StmtSerialization.cpp
index 25e9514..99a8909 100644
--- a/lib/AST/StmtSerialization.cpp
+++ b/lib/AST/StmtSerialization.cpp
@@ -518,6 +518,17 @@
return new DeclRefExpr(decl,T,Loc);
}
+void ObjCSuperRefExpr::EmitImpl(Serializer& S) const {
+ S.Emit(Loc);
+ S.Emit(getType());
+}
+
+ObjCSuperRefExpr* ObjCSuperRefExpr::CreateImpl(Deserializer& D, ASTContext& C) {
+ SourceLocation Loc = SourceLocation::ReadVal(D);
+ QualType T = QualType::ReadVal(D);
+ return new ObjCSuperRefExpr(T, Loc);
+}
+
DeclStmt* DeclStmt::CreateImpl(Deserializer& D, ASTContext& C) {
ScopedDecl* decl = cast<ScopedDecl>(D.ReadOwnedPtr<Decl>(C));
SourceLocation StartLoc = SourceLocation::ReadVal(D);
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index f75c392..626e829 100644
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -99,6 +99,11 @@
static_cast<Expr*>(SelfExpr.Val), true, true);
}
}
+ if (!strncmp(II.getName(), "super", 5)) {
+ QualType T = Context.getPointerType(Context.getObjCInterfaceType(
+ CurMethodDecl->getClassInterface()));
+ return new ObjCSuperRefExpr(T, Loc);
+ }
}
if (D == 0) {
diff --git a/test/Sema/objc-property-7.m b/test/Sema/objc-property-7.m
new file mode 100644
index 0000000..ef7a98a
--- /dev/null
+++ b/test/Sema/objc-property-7.m
@@ -0,0 +1,34 @@
+// RUN: clang -fsyntax-only -verify %s
+typedef signed char BOOL;
+typedef struct _NSZone NSZone;
+
+@protocol NSObject
+- (BOOL)isEqual:(id)object;
+@end
+
+@protocol NSCopying
+- (id)copyWithZone:(NSZone *)zone;
+@end
+
+@interface NSObject <NSObject> {}
+@end
+
+@class NSString, NSData, NSMutableData, NSMutableDictionary, NSMutableArray;
+
+@interface SCMObject : NSObject <NSCopying> {}
+ @property(assign) SCMObject *__attribute__((objc_gc(weak))) parent;
+@end
+
+@interface SCMNode : SCMObject
+{
+ NSString *_name;
+}
+@property(copy) NSString *name;
+@end
+
+@implementation SCMNode
+ @synthesize name = _name;
+ - (void) setParent:(SCMNode*) inParent {
+ super.parent = inParent;
+ }
+@end