r230274 - Revert "Improve declaration / expression disambiguation around ptr-operators, and use"
Justin Bogner
mail at justinbogner.com
Mon Feb 23 14:36:28 PST 2015
Author: bogner
Date: Mon Feb 23 16:36:28 2015
New Revision: 230274
URL: http://llvm.org/viewvc/llvm-project?rev=230274&view=rev
Log:
Revert "Improve declaration / expression disambiguation around ptr-operators, and use"
This seems to break mixing function-style and c-style casts, and is
breaking bootstrapping llvm.
This reverts r230261.
Modified:
cfe/trunk/include/clang/Parse/Parser.h
cfe/trunk/lib/Parse/ParseTentative.cpp
cfe/trunk/test/Parser/cxx-ambig-init-templ.cpp
cfe/trunk/test/Parser/cxx-variadic-func.cpp
cfe/trunk/test/Parser/recovery.cpp
cfe/trunk/test/SemaTemplate/rdar9173693.cpp
Modified: cfe/trunk/include/clang/Parse/Parser.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Parse/Parser.h?rev=230274&r1=230273&r2=230274&view=diff
==============================================================================
--- cfe/trunk/include/clang/Parse/Parser.h (original)
+++ cfe/trunk/include/clang/Parse/Parser.h Mon Feb 23 16:36:28 2015
@@ -1941,12 +1941,11 @@ private:
TPResult TryParsePtrOperatorSeq();
TPResult TryParseOperatorId();
TPResult TryParseInitDeclaratorList();
- TPResult TryParseDeclarator(bool MayBeAbstract, bool MayHaveIdentifier = true,
- bool VersusExpression = true);
+ TPResult TryParseDeclarator(bool mayBeAbstract, bool mayHaveIdentifier=true);
TPResult
TryParseParameterDeclarationClause(bool *InvalidAsDeclaration = nullptr,
bool VersusTemplateArg = false);
- TPResult TryParseFunctionDeclarator(bool VersusExpression = true);
+ TPResult TryParseFunctionDeclarator();
TPResult TryParseBracketDeclarator();
TPResult TryConsumeDeclarationSpecifier();
Modified: cfe/trunk/lib/Parse/ParseTentative.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseTentative.cpp?rev=230274&r1=230273&r2=230274&view=diff
==============================================================================
--- cfe/trunk/lib/Parse/ParseTentative.cpp (original)
+++ cfe/trunk/lib/Parse/ParseTentative.cpp Mon Feb 23 16:36:28 2015
@@ -284,7 +284,7 @@ Parser::TPResult Parser::TryParseSimpleD
Parser::TPResult Parser::TryParseInitDeclaratorList() {
while (1) {
// declarator
- TPResult TPR = TryParseDeclarator(false/*MayBeAbstract*/);
+ TPResult TPR = TryParseDeclarator(false/*mayBeAbstract*/);
if (TPR != TPResult::Ambiguous)
return TPR;
@@ -361,7 +361,7 @@ bool Parser::isCXXConditionDeclaration()
assert(Tok.is(tok::l_paren) && "Expected '('");
// declarator
- TPR = TryParseDeclarator(false/*MayBeAbstract*/);
+ TPR = TryParseDeclarator(false/*mayBeAbstract*/);
// In case of an error, let the declaration parsing code handle it.
if (TPR == TPResult::Error)
@@ -431,7 +431,7 @@ bool Parser::isCXXTypeId(TentativeCXXTyp
assert(Tok.is(tok::l_paren) && "Expected '('");
// declarator
- TPR = TryParseDeclarator(/*MayBeAbstract*/true, /*MayHaveIdentifier*/false);
+ TPR = TryParseDeclarator(true/*mayBeAbstract*/, false/*mayHaveIdentifier*/);
// In case of an error, let the declaration parsing code handle it.
if (TPR == TPResult::Error)
@@ -623,7 +623,6 @@ Parser::isCXX11AttributeSpecifier(bool D
}
Parser::TPResult Parser::TryParsePtrOperatorSeq() {
- bool ConsumedAny = false;
while (true) {
if (Tok.is(tok::coloncolon) || Tok.is(tok::identifier))
if (TryAnnotateCXXScopeToken(true))
@@ -638,9 +637,8 @@ Parser::TPResult Parser::TryParsePtrOper
Tok.is(tok::kw_volatile) ||
Tok.is(tok::kw_restrict))
ConsumeToken();
- ConsumedAny = true;
} else {
- return ConsumedAny ? TPResult::True : TPResult::False;
+ return TPResult::True;
}
}
}
@@ -736,8 +734,7 @@ Parser::TPResult Parser::TryParseOperato
return TPResult::Error;
AnyDeclSpecifiers = true;
}
- return TryParsePtrOperatorSeq() == TPResult::Error ? TPResult::Error
- : TPResult::True;
+ return TryParsePtrOperatorSeq();
}
/// declarator:
@@ -793,23 +790,13 @@ Parser::TPResult Parser::TryParseOperato
/// '~' decltype-specifier [TODO]
/// template-id [TODO]
///
-Parser::TPResult Parser::TryParseDeclarator(bool MayBeAbstract,
- bool MayHaveIdentifier,
- bool VersusExpression) {
+Parser::TPResult Parser::TryParseDeclarator(bool mayBeAbstract,
+ bool mayHaveIdentifier) {
// declarator:
// direct-declarator
// ptr-operator declarator
- {
- TPResult TPR = TryParsePtrOperatorSeq();
- if (TPR == TPResult::Error)
- return TPResult::Error;
- // After a ptr-operator, any of ')', ',', ';', and '...' indicates
- // that this cannot be an expression.
- if (VersusExpression && TPR == TPResult::True &&
- (Tok.is(tok::r_paren) || Tok.is(tok::comma) || Tok.is(tok::ellipsis) ||
- Tok.is(tok::semi)))
- return TPResult::True;
- }
+ if (TryParsePtrOperatorSeq() == TPResult::Error)
+ return TPResult::Error;
// direct-declarator:
// direct-abstract-declarator:
@@ -819,7 +806,7 @@ Parser::TPResult Parser::TryParseDeclara
if ((Tok.is(tok::identifier) || Tok.is(tok::kw_operator) ||
(Tok.is(tok::annot_cxxscope) && (NextToken().is(tok::identifier) ||
NextToken().is(tok::kw_operator)))) &&
- MayHaveIdentifier) {
+ mayHaveIdentifier) {
// declarator-id
if (Tok.is(tok::annot_cxxscope))
ConsumeToken();
@@ -832,14 +819,14 @@ Parser::TPResult Parser::TryParseDeclara
ConsumeToken();
} else if (Tok.is(tok::l_paren)) {
ConsumeParen();
- if (MayBeAbstract &&
+ if (mayBeAbstract &&
(Tok.is(tok::r_paren) || // 'int()' is a function.
// 'int(...)' is a function.
(Tok.is(tok::ellipsis) && NextToken().is(tok::r_paren)) ||
isDeclarationSpecifier())) { // 'int(int)' is a function.
// '(' parameter-declaration-clause ')' cv-qualifier-seq[opt]
// exception-specification[opt]
- TPResult TPR = TryParseFunctionDeclarator(VersusExpression);
+ TPResult TPR = TryParseFunctionDeclarator();
if (TPR != TPResult::Ambiguous)
return TPR;
} else {
@@ -855,15 +842,14 @@ Parser::TPResult Parser::TryParseDeclara
Tok.is(tok::kw___vectorcall) ||
Tok.is(tok::kw___unaligned))
return TPResult::True; // attributes indicate declaration
- TPResult TPR = TryParseDeclarator(MayBeAbstract, MayHaveIdentifier,
- VersusExpression);
+ TPResult TPR = TryParseDeclarator(mayBeAbstract, mayHaveIdentifier);
if (TPR != TPResult::Ambiguous)
return TPR;
if (Tok.isNot(tok::r_paren))
return TPResult::False;
ConsumeParen();
}
- } else if (!MayBeAbstract) {
+ } else if (!mayBeAbstract) {
return TPResult::False;
}
@@ -879,13 +865,13 @@ Parser::TPResult Parser::TryParseDeclara
// initializer that follows the declarator. Note that ctor-style
// initializers are not possible in contexts where abstract declarators
// are allowed.
- if (!MayBeAbstract && !isCXXFunctionDeclarator())
+ if (!mayBeAbstract && !isCXXFunctionDeclarator())
break;
// direct-declarator '(' parameter-declaration-clause ')'
// cv-qualifier-seq[opt] exception-specification[opt]
ConsumeParen();
- TPR = TryParseFunctionDeclarator(VersusExpression);
+ TPR = TryParseFunctionDeclarator();
} else if (Tok.is(tok::l_square)) {
// direct-declarator '[' constant-expression[opt] ']'
// direct-abstract-declarator[opt] '[' constant-expression[opt] ']'
@@ -1724,8 +1710,7 @@ Parser::TryParseParameterDeclarationClau
// declarator
// abstract-declarator[opt]
- TPR = TryParseDeclarator(/*MayBeAbstract*/true, /*MayHaveIdentifier*/true,
- /*VersusExpression*/!VersusTemplateArgument);
+ TPR = TryParseDeclarator(true/*mayBeAbstract*/);
if (TPR != TPResult::Ambiguous)
return TPR;
@@ -1772,15 +1757,9 @@ Parser::TryParseParameterDeclarationClau
/// TryParseFunctionDeclarator - We parsed a '(' and we want to try to continue
/// parsing as a function declarator.
-///
/// If TryParseFunctionDeclarator fully parsed the function declarator, it will
-/// return TPResult::Ambiguous.
-///
-/// If \p VersusExpression is true and this cannot be a function-style
-/// cast expression, returns TPResult::True.
-///
-/// Otherwise, returns TPResult::False if this can't be a function declarator
-/// and TPResult::Error if it can't be anything.
+/// return TPResult::Ambiguous, otherwise it will return either False() or
+/// Error().
///
/// '(' parameter-declaration-clause ')' cv-qualifier-seq[opt]
/// exception-specification[opt]
@@ -1788,7 +1767,7 @@ Parser::TryParseParameterDeclarationClau
/// exception-specification:
/// 'throw' '(' type-id-list[opt] ')'
///
-Parser::TPResult Parser::TryParseFunctionDeclarator(bool VersusExpression) {
+Parser::TPResult Parser::TryParseFunctionDeclarator() {
// The '(' is already parsed.
@@ -1796,9 +1775,8 @@ Parser::TPResult Parser::TryParseFunctio
if (TPR == TPResult::Ambiguous && Tok.isNot(tok::r_paren))
TPR = TPResult::False;
- if (TPR != TPResult::Ambiguous)
- if (VersusExpression || TPR != TPResult::True)
- return TPR;
+ if (TPR == TPResult::False || TPR == TPResult::Error)
+ return TPR;
// Parse through the parens.
if (!SkipUntil(tok::r_paren, StopAtSemi))
Modified: cfe/trunk/test/Parser/cxx-ambig-init-templ.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Parser/cxx-ambig-init-templ.cpp?rev=230274&r1=230273&r2=230274&view=diff
==============================================================================
--- cfe/trunk/test/Parser/cxx-ambig-init-templ.cpp (original)
+++ cfe/trunk/test/Parser/cxx-ambig-init-templ.cpp Mon Feb 23 16:36:28 2015
@@ -170,15 +170,6 @@ namespace ElaboratedTypeSpecifiers {
};
}
-namespace AbstractPtrOperatorDeclarator {
- template <int, typename> struct X {
- operator int();
- };
- struct Y {
- void f(int a = X<0, int (*)()>());
- };
-}
-
namespace PR20459 {
template <typename EncTraits> struct A {
void foo(int = EncTraits::template TypeEnc<int, int>::val); // ok
Modified: cfe/trunk/test/Parser/cxx-variadic-func.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Parser/cxx-variadic-func.cpp?rev=230274&r1=230273&r2=230274&view=diff
==============================================================================
--- cfe/trunk/test/Parser/cxx-variadic-func.cpp (original)
+++ cfe/trunk/test/Parser/cxx-variadic-func.cpp Mon Feb 23 16:36:28 2015
@@ -1,7 +1,8 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
void f(...) {
- int g(int(...)); // no warning, unambiguously a function declaration
+ // FIXME: There's no disambiguation here; this is unambiguous.
+ int g(int(...)); // expected-warning {{disambiguated}} expected-note {{paren}}
}
void h(int n..., int m); // expected-error {{expected ')'}} expected-note {{to match}}
Modified: cfe/trunk/test/Parser/recovery.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Parser/recovery.cpp?rev=230274&r1=230273&r2=230274&view=diff
==============================================================================
--- cfe/trunk/test/Parser/recovery.cpp (original)
+++ cfe/trunk/test/Parser/recovery.cpp Mon Feb 23 16:36:28 2015
@@ -203,14 +203,6 @@ namespace pr15133 {
};
}
-namespace AbstractPtrOperator {
- // A ptr-operator and no name means we have a declaration and not an
- // expression.
- template<typename T> int f(int*, T::type); // expected-error {{missing 'typename'}}
- template<typename T> int f(int (T::*), T::type); // expected-error {{missing 'typename'}}
- template<typename T> int f(int (*)(), T::type); // expected-error {{missing 'typename'}}
-}
-
namespace InvalidEmptyNames {
// These shouldn't crash, the diagnostics aren't important.
struct ::, struct ::; // expected-error 2 {{expected identifier}} expected-error 2 {{declaration of anonymous struct must be a definition}} expected-warning {{declaration does not declare anything}}
Modified: cfe/trunk/test/SemaTemplate/rdar9173693.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaTemplate/rdar9173693.cpp?rev=230274&r1=230273&r2=230274&view=diff
==============================================================================
--- cfe/trunk/test/SemaTemplate/rdar9173693.cpp (original)
+++ cfe/trunk/test/SemaTemplate/rdar9173693.cpp Mon Feb 23 16:36:28 2015
@@ -2,5 +2,5 @@
// <rdar://problem/9173693>
template< bool C > struct assert { };
-template< bool > struct assert_arg_pred_impl { }; // expected-note 2 {{declared here}}
-template< typename Pred > assert<false> assert_not_arg( void (*)(Pred), typename assert_arg_pred<Pred>::type ); // expected-error 3 {{}}
+template< bool > struct assert_arg_pred_impl { }; // expected-note 3 {{declared here}}
+template< typename Pred > assert<false> assert_not_arg( void (*)(Pred), typename assert_arg_pred<Pred>::type ); // expected-error 5 {{}}
More information about the cfe-commits
mailing list