commit a9d100178c00306bf0f9ba4df5e80298248fdfe8
author Richard Smith <richard-llvm@metafoo.co.uk> Sat Oct 04 01:57:39 2014 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Sat Oct 04 01:57:39 2014 +0000
tree 83606f70e8a0a6e6876fe6883de4c3ed732881ec
parent 7e26a67ffa5da8e8db5ab2a8862060943ca5e17b

PR20991: ::decltype is not valid.

llvm-svn: 219043

clang/lib/Parse/ParseExprCXX.cpp

diff --git a/clang/lib/Parse/ParseExprCXX.cpp b/clang/lib/Parse/ParseExprCXX.cpp
index 8f22f56..47fdd82 100644
--- a/clang/lib/Parse/ParseExprCXX.cpp
+++ b/clang/lib/Parse/ParseExprCXX.cpp
@@ -242,7 +242,8 @@
     *MayBePseudoDestructor = false;
   }
 
-  if (Tok.is(tok::kw_decltype) || Tok.is(tok::annot_decltype)) {
+  if (!HasScopeSpecifier &&
+      (Tok.is(tok::kw_decltype) || Tok.is(tok::annot_decltype))) {
     DeclSpec DS(AttrFactory);
     SourceLocation DeclLoc = Tok.getLocation();
     SourceLocation EndLoc  = ParseDecltypeSpecifier(DS);

clang/test/Parser/cxx0x-decl.cpp

diff --git a/clang/test/Parser/cxx0x-decl.cpp b/clang/test/Parser/cxx0x-decl.cpp
index 2cd6825..994104f 100644
--- a/clang/test/Parser/cxx0x-decl.cpp
+++ b/clang/test/Parser/cxx0x-decl.cpp
@@ -116,6 +116,11 @@
   };
 }
 
+namespace ColonColonDecltype {
+  struct S { struct T {}; };
+  ::decltype(S())::T invalid; // expected-error {{expected unqualified-id}}
+}
+
 struct Base { virtual void f() = 0; virtual void g() = 0; virtual void h() = 0; };
 struct MemberComponentOrder : Base {
   void f() override __asm__("foobar") __attribute__(( )) {}