aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancois Pichet <pichet2000@gmail.com>2011-06-19 08:02:06 +0000
committerFrancois Pichet <pichet2000@gmail.com>2011-06-19 08:02:06 +0000
commite3d49b44ad0596b2998ecf2e7ca78d59188920e5 (patch)
tree9f29746ba383d5f657d784881ac775ae4b558ebf
parent4e5c886eb6b3e86f7de0f203a2f643d764880cb6 (diff)
Handle decltype keyword in Parser::isDeclarationSpecifier.
Fixes PR10154. Found by parsing MFC 2010 code with clang. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@133380 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/Parse/ParseDecl.cpp4
-rw-r--r--test/SemaCXX/decltype.cpp5
2 files changed, 9 insertions, 0 deletions
diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp
index 2d3fcf8340..9af7345fdd 100644
--- a/lib/Parse/ParseDecl.cpp
+++ b/lib/Parse/ParseDecl.cpp
@@ -3018,6 +3018,10 @@ bool Parser::isDeclarationSpecifier(bool DisambiguatingWithExpression) {
case tok::kw___attribute:
return true;
+ // C++0x decltype.
+ case tok::kw_decltype:
+ return true;
+
// GNU ObjC bizarre protocol extension: <proto1,proto2> with implicit 'id'.
case tok::less:
return getLang().ObjC1;
diff --git a/test/SemaCXX/decltype.cpp b/test/SemaCXX/decltype.cpp
index d4ef7e33a1..f61a92b71e 100644
--- a/test/SemaCXX/decltype.cpp
+++ b/test/SemaCXX/decltype.cpp
@@ -16,3 +16,8 @@ void test_f2() {
float &fr = f2(AC().a);
}
+namespace pr10154 {
+ class A{
+ A(decltype(nullptr) param);
+ };
+} \ No newline at end of file