"This moves built-in Objective-C types up the scope chains to where they can be repla...

This makes it ok to use @"foo" without a declaration for NSConstantString.

Patch by David Chisnall!

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@52593 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Sema/Sema.cpp b/lib/Sema/Sema.cpp
index 78cc5d85af5f0d4eab58c9d828f3abc6f6853a6b..3296bf3550a46f9b07f646b78cefe4399829a4ae 100644 (file)
--- a/lib/Sema/Sema.cpp
+++ b/lib/Sema/Sema.cpp
@@ -45,17 +45,6 @@ void Sema::ActOnTranslationUnitScope(SourceLocation Loc, Scope *S) {
   CurContext = Context.getTranslationUnitDecl();
   if (!PP.getLangOptions().ObjC1) return;
   
-  TypedefType *t;
-  
-  // Add the built-in ObjC types.
-  t = cast<TypedefType>(Context.getObjCIdType().getTypePtr());
-  PushOnScopeChains(t->getDecl(), TUScope);
-  t = cast<TypedefType>(Context.getObjCClassType().getTypePtr());
-  PushOnScopeChains(t->getDecl(), TUScope);
-  ObjCInterfaceType *it = cast<ObjCInterfaceType>(Context.getObjCProtoType());
-  ObjCInterfaceDecl *IDecl = it->getDecl();
-  PushOnScopeChains(IDecl, TUScope);
-  
   // Synthesize "typedef struct objc_selector *SEL;"
   RecordDecl *SelTag = RecordDecl::Create(Context, TagDecl::TK_struct, CurContext,
                                           SourceLocation(), 
@@ -70,6 +59,40 @@ void Sema::ActOnTranslationUnitScope(SourceLocation Loc, Scope *S) {
                                                 SelT, 0);
   PushOnScopeChains(SelTypedef, TUScope);
   Context.setObjCSelType(SelTypedef);
+
+  RecordDecl *ClassTag = RecordDecl::Create(Context, TagDecl::TK_struct,
+                                            CurContext,
+                                            SourceLocation(),
+                                            &Context.Idents.get("objc_class"),
+                                            0);
+  QualType ClassT = Context.getPointerType(Context.getTagDeclType(ClassTag));
+  TypedefDecl *ClassTypedef = 
+    TypedefDecl::Create(Context, CurContext, SourceLocation(),
+                        &Context.Idents.get("Class"), ClassT, 0);
+  PushOnScopeChains(ClassTag, TUScope);
+  PushOnScopeChains(ClassTypedef, TUScope);
+  Context.setObjCClassType(ClassTypedef);
+  // Synthesize "@class Protocol;
+  ObjCInterfaceDecl *ProtocolDecl =
+    ObjCInterfaceDecl::Create(Context, SourceLocation(), 0, 
+                              &Context.Idents.get("Protocol"), 
+                              SourceLocation(), true);
+  Context.setObjCProtoType(Context.getObjCInterfaceType(ProtocolDecl));
+  PushOnScopeChains(ProtocolDecl, TUScope);
+  
+  // Synthesize "typedef struct objc_object { Class isa; } *id;"
+  RecordDecl *ObjectTag = 
+    RecordDecl::Create(Context, TagDecl::TK_struct, CurContext,
+                       SourceLocation(),
+                       &Context.Idents.get("objc_object"), 0);
+  QualType ObjT = Context.getPointerType(Context.getTagDeclType(ObjectTag));
+  PushOnScopeChains(ObjectTag, TUScope);
+  TypedefDecl *IdTypedef = TypedefDecl::Create(Context, CurContext,
+                                               SourceLocation(),
+                                               &Context.Idents.get("id"),
+                                               ObjT, 0);
+  PushOnScopeChains(IdTypedef, TUScope);
+  Context.setObjCIdType(IdTypedef);
 }
 
 Sema::Sema(Preprocessor &pp, ASTContext &ctxt, ASTConsumer &consumer)
@@ -92,46 +115,6 @@ Sema::Sema(Preprocessor &pp, ASTContext &ctxt, ASTConsumer &consumer)
   KnownFunctionIDs[id_vsprintf]  = &IT.get("vsprintf");
   KnownFunctionIDs[id_vprintf]   = &IT.get("vprintf");
 
-  // FIXME: Move this initialization up to Sema::ActOnTranslationUnitScope()
-  // and make sure the decls get inserted into TUScope!
-  // FIXME: And make sure they don't leak!
-  if (PP.getLangOptions().ObjC1) {
-    TranslationUnitDecl *TUDecl = Context.getTranslationUnitDecl();
-
-    // Synthesize "typedef struct objc_class *Class;"
-    RecordDecl *ClassTag = RecordDecl::Create(Context, TagDecl::TK_struct,
-                                              TUDecl,
-                                              SourceLocation(),
-                                              &IT.get("objc_class"), 0);
-    QualType ClassT = Context.getPointerType(Context.getTagDeclType(ClassTag));
-    TypedefDecl *ClassTypedef = 
-      TypedefDecl::Create(Context, TUDecl, SourceLocation(),
-                          &Context.Idents.get("Class"), ClassT, 0);
-    Context.setObjCClassType(ClassTypedef);
-    
-    // Synthesize "@class Protocol;
-    ObjCInterfaceDecl *ProtocolDecl =
-      ObjCInterfaceDecl::Create(Context, SourceLocation(), 0, 
-                                &Context.Idents.get("Protocol"), 
-                                SourceLocation(), true);
-    Context.setObjCProtoType(Context.getObjCInterfaceType(ProtocolDecl));
-    
-    // Synthesize "typedef struct objc_object { Class isa; } *id;"
-    RecordDecl *ObjectTag = 
-      RecordDecl::Create(Context, TagDecl::TK_struct, TUDecl,
-                         SourceLocation(),
-                         &IT.get("objc_object"), 0);
-    FieldDecl *IsaDecl = FieldDecl::Create(Context, SourceLocation(),
-                                           &Context.Idents.get("isa"),
-                                           Context.getObjCClassType());
-    ObjectTag->defineBody(&IsaDecl, 1);
-    QualType ObjT = Context.getPointerType(Context.getTagDeclType(ObjectTag));
-    TypedefDecl *IdTypedef = TypedefDecl::Create(Context, TUDecl,
-                                                 SourceLocation(),
-                                                 &Context.Idents.get("id"),
-                                                 ObjT, 0);
-    Context.setObjCIdType(IdTypedef);
-  }
   TUScope = 0;
 }
 

diff --git a/test/CodeGen/empty-union-init.c b/test/CodeGen/empty-union-init.c
index 6b8def9a643aa7d77e379efe7c799bc2ffefb642..82ff84d0deb2179fc773a3b5b27be1c5342ff7cc 100644 (file)
--- a/test/CodeGen/empty-union-init.c
+++ b/test/CodeGen/empty-union-init.c
@@ -1,4 +1,5 @@
 // RUN: clang -emit-llvm < %s -o -
+// PR2419
 
 struct Mem {
         union {

diff --git a/test/Sema/objc-string.m b/test/Sema/objc-string.m
index c73948292d81edafa8d477243b0fd6f5a65e17a1..d1d797348d22658a3a8d36f0e95ea7e23bb2225f 100644 (file)
--- a/test/Sema/objc-string.m
+++ b/test/Sema/objc-string.m
@@ -1,11 +1,15 @@
 // RUN: clang %s -verify -fsyntax-only
+// RUN: clang %s -verify -fsyntax-only -DDECLAREIT
 
+// a declaration of NSConstantString is not required.
+#ifdef DECLAREIT
 @interface NSConstantString;
 @end
+#endif
 
 
 
-NSConstantString *s = @"123"; // simple
-NSConstantString *t = @"123" @"456"; // concat
-NSConstantString *u = @"123" @ blah; // expected-error: {{unexpected token}}
+id s = @"123"; // simple
+id t = @"123" @"456"; // concat
+id u = @"123" @ blah; // expected-error: {{unexpected token}}