Consider GNU attributes when doing ambiguity resolution.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@57108 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Parse/ParseTentative.cpp b/lib/Parse/ParseTentative.cpp
index 414f1f5..5e4888f 100644
--- a/lib/Parse/ParseTentative.cpp
+++ b/lib/Parse/ParseTentative.cpp
@@ -164,12 +164,13 @@
return TPR_ambiguous;
}
-/// init-declarator-list:
-/// init-declarator
-/// init-declarator-list ',' init-declarator
+/// init-declarator-list:
+/// init-declarator
+/// init-declarator-list ',' init-declarator
///
-/// init-declarator:
-/// declarator initializer[opt]
+/// init-declarator:
+/// declarator initializer[opt]
+/// [GNU] declarator simple-asm-expr[opt] attributes[opt] initializer[opt]
///
/// initializer:
/// '=' initializer-clause
@@ -195,6 +196,10 @@
if (TPR != TPR_ambiguous)
return TPR;
+ // [GNU] simple-asm-expr[opt] attributes[opt]
+ if (Tok.is(tok::kw_asm) || Tok.is(tok::kw___attribute))
+ return TPR_true;
+
// initializer[opt]
if (Tok.is(tok::l_paren)) {
// Parse through the parens.
@@ -230,6 +235,7 @@
/// cv-qualifier-seq[opt] exception-specification[opt]
/// direct-declarator '[' constant-expression[opt] ']'
/// '(' declarator ')'
+/// [GNU] '(' attributes declarator ')'
///
/// abstract-declarator:
/// ptr-operator abstract-declarator[opt]
@@ -302,8 +308,11 @@
return TPR;
} else {
// '(' declarator ')'
+ // '(' attributes declarator ')'
// '(' abstract-declarator ')'
- ConsumeParen();
+ ConsumeParen();
+ if (Tok.is(tok::kw___attribute))
+ return TPR_true; // attributes indicate declaration
TentativeParsingResult TPR = TryParseDeclarator(mayBeAbstract);
if (TPR != TPR_ambiguous)
return TPR;