Move & comment the 'decltype in declarator-id' as suggested by Doug Gregor.
llvm-svn: 146576
diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index 63a1b80..238dbd4 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -3203,16 +3203,6 @@
(S->getFlags() & Scope::TemplateParamScope) != 0)
S = S->getParent();
- if (NestedNameSpecifierLoc SpecLoc =
- D.getCXXScopeSpec().getWithLocInContext(Context)) {
- while (SpecLoc.getPrefix())
- SpecLoc = SpecLoc.getPrefix();
- if (dyn_cast_or_null<DecltypeType>(
- SpecLoc.getNestedNameSpecifier()->getAsType()))
- Diag(SpecLoc.getBeginLoc(), diag::err_decltype_in_declarator)
- << SpecLoc.getTypeLoc().getSourceRange();
- }
-
DeclContext *DC = CurContext;
if (D.getCXXScopeSpec().isInvalid())
D.setInvalidType();
@@ -3377,6 +3367,20 @@
<< Name << cast<NamedDecl>(DC) << R;
D.setInvalidType();
}
+
+ // C++11 8.3p1:
+ // ... "The nested-name-specifier of the qualified declarator-id shall
+ // not begin with a decltype-specifer"
+ NestedNameSpecifierLoc SpecLoc =
+ D.getCXXScopeSpec().getWithLocInContext(Context);
+ assert(SpecLoc && "A non-empty CXXScopeSpec should have a non-empty "
+ "NestedNameSpecifierLoc");
+ while (SpecLoc.getPrefix())
+ SpecLoc = SpecLoc.getPrefix();
+ if (dyn_cast_or_null<DecltypeType>(
+ SpecLoc.getNestedNameSpecifier()->getAsType()))
+ Diag(SpecLoc.getBeginLoc(), diag::err_decltype_in_declarator)
+ << SpecLoc.getTypeLoc().getSourceRange();
}
}