C++ support for Objective-C lightweight generics.

Teach C++'s tentative parsing to handle specializations of Objective-C
class types (e.g., NSArray<NSString *>) as well as Objective-C
protocol qualifiers (id<NSCopying>) by extending type-annotation
tokens to handle this case. As part of this, remove Objective-C
protocol qualifiers from the declaration specifiers, which never
really made sense: instead, provide Sema entry points to make them
part of the type annotation token. Among other things, this properly
diagnoses bogus types such as "<NSCopying> id" which should have been
written as "id <NSCopying>".

Implements template instantiation support for, e.g., NSArray<T>*
in C++. Note that parameterized classes are not templates in the C++
sense, so that cannot (for example) be used as a template argument for
a template template parameter. Part of rdar://problem/6294649.

llvm-svn: 241545

1 files changed, 4 insertions, 1 deletions

diff --git a/clang/lib/Parse/ParseInit.cpp b/clang/lib/Parse/ParseInit.cpp
index f62c8be0769..fe7e8f8ea35 100644
--- a/clang/lib/Parse/ParseInit.cpp
+++ b/clang/lib/Parse/ParseInit.cpp
@@ -274,8 +274,11 @@ ExprResult Parser::ParseInitializerWithPotentialDesignator() {
 
         // Parse type arguments and protocol qualifiers.
         if (Tok.is(tok::less)) {
+          SourceLocation NewEndLoc;
           TypeResult NewReceiverType
-            = ParseObjCTypeArgsAndProtocolQualifiers(IILoc, ReceiverType);
+            = parseObjCTypeArgsAndProtocolQualifiers(IILoc, ReceiverType,
+                                                     /*consumeLastToken=*/true,
+                                                     NewEndLoc);
           if (!NewReceiverType.isUsable()) {
             SkipUntil(tok::r_square, StopAtSemi);
             return ExprError();