arphaman created this revision.
arphaman added reviewers: manmanren, ahatanak.
arphaman added a subscriber: cfe-commits.
arphaman set the repository for this revision to rL LLVM.
This patch ensures that Sema won't enter a C++ declarator context when the
current context is an Objective-C declaration. This prevents an assertion
failure in `EnterDeclaratorContext` that's used to ensure that current context
will be restored correctly after exiting the declarator context. I think that
this approach is reasonable as AFAIK we don't need to use the C++ declarator
contexts directly in Objective-C declarations, since they're mostly used to
define out of line variables declared in classes or namespaces which shouldn't
be done inside an Objective-C declaration.
Repository:
rL LLVM
https://reviews.llvm.org/D26922
Files:
lib/Sema/SemaCXXScopeSpec.cpp
test/SemaObjCXX/crash.mm
Index: test/SemaObjCXX/crash.mm
===================================================================
--- test/SemaObjCXX/crash.mm
+++ test/SemaObjCXX/crash.mm
@@ -25,3 +25,17 @@
// expected-warning@-2 {{variadic templates are a C++11 extension}}
#endif
@end
+
+// rdar://20560175
+
+struct OuterType {
+ typedef int InnerType;
+};
+
+@protocol InvalidProperty
+@property (nonatomic) (OuterType::InnerType) invalidTypeParens;
+// expected-error@-1 {{type name requires a specifier or qualifier}}
+// expected-error@-2 {{expected ';' at end of declaration list}}
+// expected-error@-3 {{C++ requires a type specifier for all declarations}}
+// expected-error@-4 {{cannot declare variable inside @interface or @protocol}}
+@end
Index: lib/Sema/SemaCXXScopeSpec.cpp
===================================================================
--- lib/Sema/SemaCXXScopeSpec.cpp
+++ lib/Sema/SemaCXXScopeSpec.cpp
@@ -1054,7 +1054,12 @@
// it is a complete declaration context.
if (!DC->isDependentContext() && RequireCompleteDeclContext(SS, DC))
return true;
-
+
+ // Don't enter a declarator context when the current context is an
Objective-C
+ // declaration as we might no be able to restore it when exiting the scope.
+ if (isa<ObjCContainerDecl>(CurContext) || isa<ObjCMethodDecl>(CurContext))
+ return true;
+
EnterDeclaratorContext(S, DC);
// Rebuild the nested name specifier for the new scope.
Index: test/SemaObjCXX/crash.mm
===================================================================
--- test/SemaObjCXX/crash.mm
+++ test/SemaObjCXX/crash.mm
@@ -25,3 +25,17 @@
// expected-warning@-2 {{variadic templates are a C++11 extension}}
#endif
@end
+
+// rdar://20560175
+
+struct OuterType {
+ typedef int InnerType;
+};
+
+@protocol InvalidProperty
+@property (nonatomic) (OuterType::InnerType) invalidTypeParens;
+// expected-error@-1 {{type name requires a specifier or qualifier}}
+// expected-error@-2 {{expected ';' at end of declaration list}}
+// expected-error@-3 {{C++ requires a type specifier for all declarations}}
+// expected-error@-4 {{cannot declare variable inside @interface or @protocol}}
+@end
Index: lib/Sema/SemaCXXScopeSpec.cpp
===================================================================
--- lib/Sema/SemaCXXScopeSpec.cpp
+++ lib/Sema/SemaCXXScopeSpec.cpp
@@ -1054,7 +1054,12 @@
// it is a complete declaration context.
if (!DC->isDependentContext() && RequireCompleteDeclContext(SS, DC))
return true;
-
+
+ // Don't enter a declarator context when the current context is an Objective-C
+ // declaration as we might no be able to restore it when exiting the scope.
+ if (isa<ObjCContainerDecl>(CurContext) || isa<ObjCMethodDecl>(CurContext))
+ return true;
+
EnterDeclaratorContext(S, DC);
// Rebuild the nested name specifier for the new scope.
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
