CbC/CbC_llvm: clang/lib/Parse/ParseExpr.cpp comparison

comparison clang/lib/Parse/ParseExpr.cpp @ 239:173fe712db74

merge LLVM16

author	kono
date	Wed, 09 Nov 2022 18:03:41 +0900
parents	5f20bc1ed4ff c4bab56944e8
children	ca573705d418

comparison

equal deleted inserted replaced

-:8222e65f95b1
+:173fe712db74
 GreaterThanIsOperator,
 getLangOpts().CPlusPlus11);
 SourceLocation ColonLoc;
 auto SavedType = PreferredType;
-while (1) {
+while (true) {
 // Every iteration may rely on a preferred type for the whole expression.
 PreferredType = SavedType;
 // If this token has a lower precedence than we are allowed to parse (e.g.
 // because we are called recursively, or because the token is not a binop),
 // then we are done!
 ///                                     assign-expr ')'
 /// [GNU]   '__builtin_FILE' '(' ')'
 /// [GNU]   '__builtin_FUNCTION' '(' ')'
 /// [GNU]   '__builtin_LINE' '(' ')'
 /// [CLANG] '__builtin_COLUMN' '(' ')'
+/// [GNU]   '__builtin_source_location' '(' ')'
 /// [GNU]   '__builtin_types_compatible_p' '(' type-name ',' type-name ')'
 /// [GNU]   '__null'
 /// [OBJC]  '[' objc-message-expr ']'
 /// [OBJC]  '\@selector' '(' objc-selector-arg ')'
 /// [OBJC]  '\@protocol' '(' identifier ')'
 // If this expression is limited to being a unary-expression, the paren can
 // not start a cast expression.
 ParenParseOption ParenExprType;
 switch (ParseKind) {
 case CastParseKind::UnaryExprOnly:
-if (!getLangOpts().CPlusPlus)
+assert(getLangOpts().CPlusPlus && "not possible to get here in C");
-ParenExprType = CompoundLiteral;
+[[fallthrough]];
-LLVM_FALLTHROUGH;
 case CastParseKind::AnyCastExpr:
 ParenExprType = ParenParseOption::CastExpr;
 break;
 case CastParseKind::PrimaryExprOnly:
 ParenExprType = FoldExpr;
 case tok::kw___objc_no:
 Res = ParseObjCBoolLiteral();
 break;
 case tok::kw_nullptr:
-Diag(Tok, diag::warn_cxx98_compat_nullptr);
+if (getLangOpts().CPlusPlus)
+Diag(Tok, diag::warn_cxx98_compat_nullptr);
+else
+Diag(Tok, getLangOpts().C2x ? diag::warn_c17_compat_nullptr
+: diag::ext_c_nullptr);
 Res = Actions.ActOnCXXNullPtrLiteral(ConsumeToken());
 break;
 case tok::annot_primary_expr:
 case tok::annot_overload_set:
 return ExprError();
 assert(Tok.isNot(tok::kw_decltype) && Tok.isNot(tok::kw___super));
 return ParseCastExpression(ParseKind, isAddressOfOperand, isTypeCast,
 isVectorLiteral, NotPrimaryExpression);
-case tok::identifier: {      // primary-expression: identifier
+case tok::identifier:
-// unqualified-id: identifier
+ParseIdentifier: {    // primary-expression: identifier
-// constant: enumeration-constant
+// unqualified-id: identifier
+// constant: enumeration-constant
 // Turn a potentially qualified name into a annot_typename or
 // annot_cxxscope if it would be valid.  This handles things like x::y, etc.
 if (getLangOpts().CPlusPlus) {
 // Avoid the unnecessary parse-time lookup in the common case
 // where the syntax forbids a type.
 REVERTIBLE_TYPE_TRAIT(__is_aggregate);
 REVERTIBLE_TYPE_TRAIT(__is_arithmetic);
 REVERTIBLE_TYPE_TRAIT(__is_array);
 REVERTIBLE_TYPE_TRAIT(__is_assignable);
 REVERTIBLE_TYPE_TRAIT(__is_base_of);
+REVERTIBLE_TYPE_TRAIT(__is_bounded_array);
 REVERTIBLE_TYPE_TRAIT(__is_class);
 REVERTIBLE_TYPE_TRAIT(__is_complete_type);
 REVERTIBLE_TYPE_TRAIT(__is_compound);
 REVERTIBLE_TYPE_TRAIT(__is_const);
 REVERTIBLE_TYPE_TRAIT(__is_constructible);
 REVERTIBLE_TYPE_TRAIT(__is_member_object_pointer);
 REVERTIBLE_TYPE_TRAIT(__is_member_pointer);
 REVERTIBLE_TYPE_TRAIT(__is_nothrow_assignable);
 REVERTIBLE_TYPE_TRAIT(__is_nothrow_constructible);
 REVERTIBLE_TYPE_TRAIT(__is_nothrow_destructible);
+REVERTIBLE_TYPE_TRAIT(__is_nullptr);
 REVERTIBLE_TYPE_TRAIT(__is_object);
 REVERTIBLE_TYPE_TRAIT(__is_pod);
 REVERTIBLE_TYPE_TRAIT(__is_pointer);
 REVERTIBLE_TYPE_TRAIT(__is_polymorphic);
 REVERTIBLE_TYPE_TRAIT(__is_reference);
+REVERTIBLE_TYPE_TRAIT(__is_referenceable);
 REVERTIBLE_TYPE_TRAIT(__is_rvalue_expr);
 REVERTIBLE_TYPE_TRAIT(__is_rvalue_reference);
 REVERTIBLE_TYPE_TRAIT(__is_same);
 REVERTIBLE_TYPE_TRAIT(__is_scalar);
+REVERTIBLE_TYPE_TRAIT(__is_scoped_enum);
 REVERTIBLE_TYPE_TRAIT(__is_sealed);
 REVERTIBLE_TYPE_TRAIT(__is_signed);
 REVERTIBLE_TYPE_TRAIT(__is_standard_layout);
 REVERTIBLE_TYPE_TRAIT(__is_trivial);
 REVERTIBLE_TYPE_TRAIT(__is_trivially_assignable);
 REVERTIBLE_TYPE_TRAIT(__is_trivially_constructible);
 REVERTIBLE_TYPE_TRAIT(__is_trivially_copyable);
+REVERTIBLE_TYPE_TRAIT(__is_unbounded_array);
 REVERTIBLE_TYPE_TRAIT(__is_union);
 REVERTIBLE_TYPE_TRAIT(__is_unsigned);
 REVERTIBLE_TYPE_TRAIT(__is_void);
 REVERTIBLE_TYPE_TRAIT(__is_volatile);
+#define TRANSFORM_TYPE_TRAIT_DEF(_, Trait)                                     \
+REVERTIBLE_TYPE_TRAIT(RTT_JOIN(__, Trait));
+#include "clang/Basic/TransformTypeTraits.def"
 #undef REVERTIBLE_TYPE_TRAIT
 #undef RTT_JOIN
 }
 // If we find that this is in fact the name of a type trait,
 NotCastExpr, isTypeCast,
 isVectorLiteral,
 NotPrimaryExpression);
 }
 }
-#ifndef noCbC
-if(NeedPrototypeDeclaration(Tok)){
-CreatePrototypeDeclaration();
-}
-#endif
 // Consume the identifier so that we can see if it is followed by a '(' or
 // '.'.
 IdentifierInfo &II = *Tok.getIdentifierInfo();
 SourceLocation ILoc = ConsumeToken();
 const char *PrevSpec = nullptr;
 unsigned DiagID;
 DS.SetTypeSpecType(TST_typename, ILoc, PrevSpec, DiagID, Typ,
 Actions.getASTContext().getPrintingPolicy());
-Declarator DeclaratorInfo(DS, DeclaratorContext::TypeName);
+Declarator DeclaratorInfo(DS, ParsedAttributesView::none(),
+DeclaratorContext::TypeName);
 TypeResult Ty = Actions.ActOnTypeName(getCurScope(),
 DeclaratorInfo);
 if (Ty.isInvalid())
 break;
 case tok::kw___builtin_convertvector:
 case tok::kw___builtin_COLUMN:
 case tok::kw___builtin_FILE:
 case tok::kw___builtin_FUNCTION:
 case tok::kw___builtin_LINE:
+case tok::kw___builtin_source_location:
 if (NotPrimaryExpression)
 *NotPrimaryExpression = true;
 // This parses the complete suffix; we can return early.
 return ParseBuiltinPrimaryExpression();
 case tok::kw___null:
 if (NotPrimaryExpression)
 *NotPrimaryExpression = true;
 // Special treatment because of member pointers
 SourceLocation SavedLoc = ConsumeToken();
 PreferredType.enterUnary(Actions, Tok.getLocation(), tok::amp, SavedLoc);
-Res = ParseCastExpression(AnyCastExpr, true);
+Res = ParseCastExpression(AnyCastExpr, /*isAddressOfOperand=*/true);
 if (!Res.isInvalid()) {
 Expr *Arg = Res.get();
 Res = Actions.ActOnUnaryOp(getCurScope(), SavedLoc, SavedKind, Arg);
 if (Res.isInvalid())
 Res = Actions.CreateRecoveryExpr(Tok.getLocation(), Arg->getEndLoc(),
 SourceLocation SavedLoc = ConsumeToken();
 PreferredType.enterUnary(Actions, Tok.getLocation(), SavedKind, SavedLoc);
 Res = ParseCastExpression(AnyCastExpr);
 if (!Res.isInvalid()) {
 Expr *Arg = Res.get();
-Res = Actions.ActOnUnaryOp(getCurScope(), SavedLoc, SavedKind, Arg);
+Res = Actions.ActOnUnaryOp(getCurScope(), SavedLoc, SavedKind, Arg,
+isAddressOfOperand);
 if (Res.isInvalid())
 Res = Actions.CreateRecoveryExpr(SavedLoc, Arg->getEndLoc(), Arg);
 }
 return Res;
 }
 return Res;
 }
 case tok::kw__Alignof:   // unary-expression: '_Alignof' '(' type-name ')'
 if (!getLangOpts().C11)
 Diag(Tok, diag::ext_c11_feature) << Tok.getName();
-LLVM_FALLTHROUGH;
+[[fallthrough]];
 case tok::kw_alignof:    // unary-expression: 'alignof' '(' type-id ')'
 case tok::kw___alignof:  // unary-expression: '__alignof' unary-expression
 // unary-expression: '__alignof' '(' type-name ')'
 case tok::kw_sizeof:     // unary-expression: 'sizeof' unary-expression
 // unary-expression: 'sizeof' '(' type-name ')'
 unsigned DiagID;
 DS.SetTypeSpecType(TST_typename, Tok.getAnnotationEndLoc(),
 PrevSpec, DiagID, Type,
 Actions.getASTContext().getPrintingPolicy());
-Declarator DeclaratorInfo(DS, DeclaratorContext::TypeName);
+Declarator DeclaratorInfo(DS, ParsedAttributesView::none(),
+DeclaratorContext::TypeName);
 TypeResult Ty = Actions.ActOnTypeName(getCurScope(), DeclaratorInfo);
 if (Ty.isInvalid())
 break;
 ConsumeAnnotationToken();
 Res = ParseObjCMessageExpressionBody(SourceLocation(), SourceLocation(),
 Ty.get(), nullptr);
 break;
 }
-LLVM_FALLTHROUGH;
+[[fallthrough]];
 case tok::annot_decltype:
 case tok::kw_char:
 case tok::kw_wchar_t:
 case tok::kw_char8_t:
 case tok::kw_int:
 case tok::kw_long:
 case tok::kw___int64:
 case tok::kw___int128:
 case tok::kw__ExtInt:
+case tok::kw__BitInt:
 case tok::kw_signed:
 case tok::kw_unsigned:
 case tok::kw_half:
 case tok::kw_float:
 case tok::kw_double:
 case tok::kw___bf16:
 case tok::kw__Float16:
 case tok::kw___float128:
+case tok::kw___ibm128:
 case tok::kw_void:
+case tok::kw_auto:
 case tok::kw_typename:
 case tok::kw_typeof:
 case tok::kw___vector:
 #define GENERIC_IMAGE_TYPE(ImgType, Id) case tok::kw_##ImgType##_t:
 #include "clang/Basic/OpenCLImageTypes.def"
 // We have a qualified template-id that we know refers to a
 // type, translate it into a type and continue parsing as a
 // cast expression.
 CXXScopeSpec SS;
 ParseOptionalCXXScopeSpecifier(SS, /*ObjectType=*/nullptr,
-/*ObjectHadErrors=*/false,
+/*ObjectHasErrors=*/false,
 /*EnteringContext=*/false);
-AnnotateTemplateIdTokenAsType(SS);
+AnnotateTemplateIdTokenAsType(SS, ImplicitTypenameContext::Yes);
 return ParseCastExpression(ParseKind, isAddressOfOperand, NotCastExpr,
 isTypeCast, isVectorLiteral,
 NotPrimaryExpression);
 }
 }
 if (TemplateId->Kind == TNK_Type_template) {
 // We have a template-id that we know refers to a type,
 // translate it into a type and continue parsing as a cast
 // expression.
 CXXScopeSpec SS;
-AnnotateTemplateIdTokenAsType(SS);
+AnnotateTemplateIdTokenAsType(SS, ImplicitTypenameContext::Yes);
 return ParseCastExpression(ParseKind, isAddressOfOperand,
 NotCastExpr, isTypeCast, isVectorLiteral,
 NotPrimaryExpression);
 }
 // Fall through to treat the template-id as an id-expression.
-LLVM_FALLTHROUGH;
+[[fallthrough]];
 }
 case tok::kw_operator: // [C++] id-expression: operator/conversion-function-id
 Res = ParseCXXIdExpression(isAddressOfOperand);
 break;
 cutOffParsing();
 Actions.CodeCompleteExpression(getCurScope(),
 PreferredType.get(Tok.getLocation()));
 return ExprError();
 }
-#ifndef noCbC
+#define TRANSFORM_TYPE_TRAIT_DEF(_, Trait) case tok::kw___##Trait:
-case tok::kw__CbC_return:
+#include "clang/Basic/TransformTypeTraits.def"
-Res = Prepare__retForGotoWithTheEnvExpr();
+// HACK: libstdc++ uses some of the transform-type-traits as alias
-break;
+// templates, so we need to work around this.
-case tok::kw__CbC_environment:
+if (!NextToken().is(tok::l_paren)) {
-Res = Prepare__envForGotoWithTheEnvExpr();
+Tok.setKind(tok::identifier);
-break;
+Diag(Tok, diag::ext_keyword_as_ident)
-#endif
+<< Tok.getIdentifierInfo()->getName() << 0;
+goto ParseIdentifier;
+}
+goto ExpectedExpression;
 case tok::l_square:
 if (getLangOpts().CPlusPlus11) {
 if (getLangOpts().ObjC) {
 // C++11 lambda expressions and Objective-C message sends both start with a
 // square bracket.  There are three possibilities here:
 }
 if (getLangOpts().ObjC) {
 Res = ParseObjCMessageExpression();
 break;
 }
-LLVM_FALLTHROUGH;
+[[fallthrough]];
 default:
+ExpectedExpression:
 NotCastExpr = true;
 return ExprError();
 }
 // Check to see whether Res is a function designator only. If it is and we
 // "expected ';'" or similar is probably the right diagnostic here. Let
 // the caller decide what to do.
 if (Tok.isAtStartOfLine())
 return Res;
-LLVM_FALLTHROUGH;
+[[fallthrough]];
 case tok::period:
 case tok::arrow:
 break;
 default:
 /// \verbatim
 ///       postfix-expression: [C99 6.5.2]
 ///         primary-expression
 ///         postfix-expression '[' expression ']'
 ///         postfix-expression '[' braced-init-list ']'
+///         postfix-expression '[' expression-list [opt] ']'  [C++2b 12.4.5]
 ///         postfix-expression '(' argument-expression-list[opt] ')'
 ///         postfix-expression '.' identifier
 ///         postfix-expression '->' identifier
 ///         postfix-expression '++'
 ///         postfix-expression '--'
 Parser::ParsePostfixExpressionSuffix(ExprResult LHS) {
 // Now that the primary-expression piece of the postfix-expression has been
 // parsed, see if there are any postfix-expression pieces here.
 SourceLocation Loc;
 auto SavedType = PreferredType;
-while (1) {
+while (true) {
 // Each iteration relies on preferred type for the whole expression.
 PreferredType = SavedType;
 switch (Tok.getKind()) {
 case tok::code_completion:
 if (InMessageExpression)
 LHS = ParseObjCMessageExpressionBody(SourceLocation(), SourceLocation(),
 nullptr, LHS.get());
 break;
 }
 // Fall through; this isn't a message send.
-LLVM_FALLTHROUGH;
+[[fallthrough]];
 default:  // Not a postfix-expression suffix.
 return LHS;
 case tok::l_square: {  // postfix-expression: p-e '[' expression ']'
 // If we have a array postfix expression that starts on a new line and
 // reserved for attributes.
 if (CheckProhibitedCXX11Attribute()) {
 (void)Actions.CorrectDelayedTyposInExpr(LHS);
 return ExprError();
 }
 BalancedDelimiterTracker T(*this, tok::l_square);
 T.consumeOpen();
 Loc = T.getOpenLocation();
-ExprResult Idx, Length, Stride;
+ExprResult Length, Stride;
 SourceLocation ColonLocFirst, ColonLocSecond;
+ExprVector ArgExprs;
+bool HasError = false;
 PreferredType.enterSubscript(Actions, Tok.getLocation(), LHS.get());
-if (getLangOpts().CPlusPlus11 && Tok.is(tok::l_brace)) {
-Diag(Tok, diag::warn_cxx98_compat_generalized_initializer_lists);
+// We try to parse a list of indexes in all language mode first
-Idx = ParseBraceInitializer();
+// and, in we find 0 or one index, we try to parse an OpenMP array
-} else if (getLangOpts().OpenMP) {
+// section. This allow us to support C++2b multi dimensional subscript and
+// OpenMp sections in the same language mode.
+if (!getLangOpts().OpenMP || Tok.isNot(tok::colon)) {
+if (!getLangOpts().CPlusPlus2b) {
+ExprResult Idx;
+if (getLangOpts().CPlusPlus11 && Tok.is(tok::l_brace)) {
+Diag(Tok, diag::warn_cxx98_compat_generalized_initializer_lists);
+Idx = ParseBraceInitializer();
+} else {
+Idx = ParseExpression(); // May be a comma expression
+}
+LHS = Actions.CorrectDelayedTyposInExpr(LHS);
+Idx = Actions.CorrectDelayedTyposInExpr(Idx);
+if (Idx.isInvalid()) {
+HasError = true;
+} else {
+ArgExprs.push_back(Idx.get());
+}
+} else if (Tok.isNot(tok::r_square)) {
+CommaLocsTy CommaLocs;
+if (ParseExpressionList(ArgExprs, CommaLocs)) {
+LHS = Actions.CorrectDelayedTyposInExpr(LHS);
+HasError = true;
+}
+assert(
+(ArgExprs.empty() || ArgExprs.size() == CommaLocs.size() + 1) &&
+"Unexpected number of commas!");
+}
+}
+if (ArgExprs.size() <= 1 && getLangOpts().OpenMP) {
 ColonProtectionRAIIObject RAII(*this);
-// Parse [: or [ expr or [ expr :
-if (!Tok.is(tok::colon)) {
-// [ expr
-Idx = ParseExpression();
-}
 if (Tok.is(tok::colon)) {
 // Consume ':'
 ColonLocFirst = ConsumeToken();
 if (Tok.isNot(tok::r_square) &&
 (getLangOpts().OpenMP < 50 ||
-((Tok.isNot(tok::colon) && getLangOpts().OpenMP >= 50))))
+((Tok.isNot(tok::colon) && getLangOpts().OpenMP >= 50)))) {
 Length = ParseExpression();
+Length = Actions.CorrectDelayedTyposInExpr(Length);
+}
 }
 if (getLangOpts().OpenMP >= 50 &&
 (OMPClauseKind == llvm::omp::Clause::OMPC_to ||
 OMPClauseKind == llvm::omp::Clause::OMPC_from) &&
 Tok.is(tok::colon)) {
 ColonLocSecond = ConsumeToken();
 if (Tok.isNot(tok::r_square)) {
 Stride = ParseExpression();
 }
 }
-} else
+}
-Idx = ParseExpression();
 SourceLocation RLoc = Tok.getLocation();
 LHS = Actions.CorrectDelayedTyposInExpr(LHS);
-Idx = Actions.CorrectDelayedTyposInExpr(Idx);
-Length = Actions.CorrectDelayedTyposInExpr(Length);
+if (!LHS.isInvalid() && !HasError && !Length.isInvalid() &&
-if (!LHS.isInvalid() && !Idx.isInvalid() && !Length.isInvalid() &&
 !Stride.isInvalid() && Tok.is(tok::r_square)) {
 if (ColonLocFirst.isValid() || ColonLocSecond.isValid()) {
 LHS = Actions.ActOnOMPArraySectionExpr(
-LHS.get(), Loc, Idx.get(), ColonLocFirst, ColonLocSecond,
+LHS.get(), Loc, ArgExprs.empty() ? nullptr : ArgExprs[0],
-Length.get(), Stride.get(), RLoc);
+ColonLocFirst, ColonLocSecond, Length.get(), Stride.get(), RLoc);
 } else {
 LHS = Actions.ActOnArraySubscriptExpr(getCurScope(), LHS.get(), Loc,
-Idx.get(), RLoc);
+ArgExprs, RLoc);
 }
 } else {
 LHS = ExprError();
-Idx = ExprError();
 }
 // Match the ']'.
 T.consumeClose();
 break;
 ExprVector ArgExprs;
 CommaLocsTy CommaLocs;
 auto RunSignatureHelp = [&]() -> QualType {
 QualType PreferredType = Actions.ProduceCallSignatureHelp(
-getCurScope(), LHS.get(), ArgExprs, PT.getOpenLocation());
+LHS.get(), ArgExprs, PT.getOpenLocation());
 CalledSignatureHelp = true;
 return PreferredType;
 };
 if (OpKind == tok::l_paren || !LHS.isInvalid()) {
 if (Tok.isNot(tok::r_paren)) {
 ///
 /// [GNU]   typeof-specifier:
 ///           typeof ( expressions )
 ///           typeof ( type-name )
 /// [GNU/C++] typeof unary-expression
+/// [C2x]   typeof-specifier:
+///           typeof '(' typeof-specifier-argument ')'
+///           typeof_unqual '(' typeof-specifier-argument ')'
+///
+///         typeof-specifier-argument:
+///           expression
+///           type-name
 ///
 /// [OpenCL 1.1 6.11.12] vec_step built-in function:
 ///           vec_step ( expressions )
 ///           vec_step ( type-name )
 /// \endverbatim
 Parser::ParseExprAfterUnaryExprOrTypeTrait(const Token &OpTok,
 bool &isCastExpr,
 ParsedType &CastTy,
 SourceRange &CastRange) {
-assert(OpTok.isOneOf(tok::kw_typeof, tok::kw_sizeof, tok::kw___alignof,
+assert(OpTok.isOneOf(tok::kw_typeof, tok::kw_typeof_unqual, tok::kw_sizeof,
-tok::kw_alignof, tok::kw__Alignof, tok::kw_vec_step,
+tok::kw___alignof, tok::kw_alignof, tok::kw__Alignof,
+tok::kw_vec_step,
 tok::kw___builtin_omp_required_simd_align) &&
 "Not a typeof/sizeof/alignof/vec_step expression!");
 ExprResult Operand;
 if (OpTok.isOneOf(tok::kw_sizeof, tok::kw___alignof, tok::kw_alignof,
 tok::kw__Alignof)) {
 if (isTypeIdUnambiguously()) {
 DeclSpec DS(AttrFactory);
 ParseSpecifierQualifierList(DS);
-Declarator DeclaratorInfo(DS, DeclaratorContext::TypeName);
+Declarator DeclaratorInfo(DS, ParsedAttributesView::none(),
+DeclaratorContext::TypeName);
 ParseDeclarator(DeclaratorInfo);
 SourceLocation LParenLoc = PP.getLocForEndOfToken(OpTok.getLocation());
 SourceLocation RParenLoc = PP.getLocForEndOfToken(PrevTokLocation);
 if (LParenLoc.isInvalid() || RParenLoc.isInvalid()) {
 return ExprEmpty();
 }
 }
 isCastExpr = false;
-if (OpTok.is(tok::kw_typeof) && !getLangOpts().CPlusPlus) {
+if (OpTok.isOneOf(tok::kw_typeof, tok::kw_typeof_unqual) &&
+!getLangOpts().CPlusPlus) {
 Diag(Tok, diag::err_expected_after) << OpTok.getIdentifierInfo()
 << tok::l_paren;
 return ExprError();
 }
 if (ExprType == CastExpr) {
 isCastExpr = true;
 return ExprEmpty();
 }
-if (getLangOpts().CPlusPlus || OpTok.isNot(tok::kw_typeof)) {
+if (getLangOpts().CPlusPlus ||
+!OpTok.isOneOf(tok::kw_typeof, tok::kw_typeof_unqual)) {
 // GNU typeof in C requires the expression to be parenthesized. Not so for
 // sizeof/alignof or in C++. Therefore, the parenthesized expression is
 // the start of a unary-expression, but doesn't include any postfix
 // pieces. Parse these now if present.
 if (!Operand.isInvalid())
 /// Parse a __builtin_sycl_unique_stable_name expression.  Accepts a type-id as
 /// a parameter.
 ExprResult Parser::ParseSYCLUniqueStableNameExpression() {
 assert(Tok.is(tok::kw___builtin_sycl_unique_stable_name) &&
-"Not __bulitin_sycl_unique_stable_name");
+"Not __builtin_sycl_unique_stable_name");
 SourceLocation OpLoc = ConsumeToken();
 BalancedDelimiterTracker T(*this, tok::l_paren);
 // __builtin_sycl_unique_stable_name expressions are always parenthesized.
 /// [GNU]   '__builtin_types_compatible_p' '(' type-name ',' type-name ')'
 /// [GNU]   '__builtin_FILE' '(' ')'
 /// [GNU]   '__builtin_FUNCTION' '(' ')'
 /// [GNU]   '__builtin_LINE' '(' ')'
 /// [CLANG] '__builtin_COLUMN' '(' ')'
+/// [GNU]   '__builtin_source_location' '(' ')'
 /// [OCL]   '__builtin_astype' '(' assignment-expression ',' type-name ')'
 ///
 /// [GNU] offsetof-member-designator:
 /// [GNU]   identifier
 /// [GNU]   offsetof-member-designator '.' identifier
 Comps.back().isBrackets = false;
 Comps.back().U.IdentInfo = Tok.getIdentifierInfo();
 Comps.back().LocStart = Comps.back().LocEnd = ConsumeToken();
 // FIXME: This loop leaks the index expressions on error.
-while (1) {
+while (true) {
 if (Tok.is(tok::period)) {
 // offsetof-member-designator: offsetof-member-designator '.' identifier
 Comps.push_back(Sema::OffsetOfComponent());
 Comps.back().isBrackets = false;
 Comps.back().LocStart = ConsumeToken();
 break;
 }
 case tok::kw___builtin_COLUMN:
 case tok::kw___builtin_FILE:
 case tok::kw___builtin_FUNCTION:
-case tok::kw___builtin_LINE: {
+case tok::kw___builtin_LINE:
+case tok::kw___builtin_source_location: {
 // Attempt to consume the r-paren.
 if (Tok.isNot(tok::r_paren)) {
 Diag(Tok, diag::err_expected) << tok::r_paren;
 SkipUntil(tok::r_paren, StopAtSemi);
 return ExprError();
 return SourceLocExpr::Function;
 case tok::kw___builtin_LINE:
 return SourceLocExpr::Line;
 case tok::kw___builtin_COLUMN:
 return SourceLocExpr::Column;
+case tok::kw___builtin_source_location:
+return SourceLocExpr::SourceLocStruct;
 default:
 llvm_unreachable("invalid keyword");
 }
 }();
 Res = Actions.ActOnSourceLocExpr(Kind, StartLoc, ConsumeParen());
 }
 // None of these cases should fall through with an invalid Result
 // unless they've already reported an error.
 if (ExprType >= CompoundStmt && Tok.is(tok::l_brace)) {
-Diag(Tok, diag::ext_gnu_statement_expr);
+Diag(Tok, OpenLoc.isMacroID() ? diag::ext_gnu_statement_expr_macro
+: diag::ext_gnu_statement_expr);
 checkCompoundToken(OpenLoc, tok::l_paren, CompoundToken::StmtExprBegin);
 if (!getCurScope()->getFnParent() && !getCurScope()->getBlockParent()) {
 Result = ExprError(Diag(OpenLoc, diag::err_stmtexpr_file_scope));
 }
 // Parse the type declarator.
 DeclSpec DS(AttrFactory);
 ParseSpecifierQualifierList(DS);
-Declarator DeclaratorInfo(DS, DeclaratorContext::TypeName);
+Declarator DeclaratorInfo(DS, ParsedAttributesView::none(),
+DeclaratorContext::TypeName);
 ParseDeclarator(DeclaratorInfo);
 // If our type is followed by an identifier and either ':' or ']', then
 // this is probably an Objective-C message send where the leading '[' is
 // missing. Recover as if that were the case.
 }
 DefaultLoc = ConsumeToken();
 Ty = nullptr;
 } else {
 ColonProtectionRAIIObject X(*this);
-TypeResult TR = ParseTypeName();
+TypeResult TR = ParseTypeName(nullptr, DeclaratorContext::Association);
 if (TR.isInvalid()) {
 SkipUntil(tok::r_paren, StopAtSemi);
 return ExprError();
 }
 Ty = TR.get();
 /// [C++0x]   assignment-expression
 /// [C++0x]   braced-init-list
 /// \endverbatim
 bool Parser::ParseExpressionList(SmallVectorImpl<Expr *> &Exprs,
 SmallVectorImpl<SourceLocation> &CommaLocs,
-llvm::function_ref<void()> ExpressionStarts) {
+llvm::function_ref<void()> ExpressionStarts,
+bool FailImmediatelyOnInvalidExpr,
+bool EarlyTypoCorrection) {
 bool SawError = false;
-while (1) {
+while (true) {
 if (ExpressionStarts)
 ExpressionStarts();
 ExprResult Expr;
 if (getLangOpts().CPlusPlus11 && Tok.is(tok::l_brace)) {
 Diag(Tok, diag::warn_cxx98_compat_generalized_initializer_lists);
 Expr = ParseBraceInitializer();
-}
+} else
-#ifndef noCbC
-else if (Tok.is(tok::kw__CbC_return)){
-Expr = Prepare__retForGotoWithTheEnvExpr();
-}
-else if (Tok.is(tok::kw__CbC_environment)){
-Expr = Prepare__envForGotoWithTheEnvExpr();
-}
-else if (Tok.is(tok::identifier) && NeedPrototypeDeclaration(Tok)){ // check code segment declaration.
-CreatePrototypeDeclaration();
 Expr = ParseAssignmentExpression();
-}
-#endif
+if (EarlyTypoCorrection)
-else
+Expr = Actions.CorrectDelayedTyposInExpr(Expr);
-Expr = ParseAssignmentExpression();
 if (Tok.is(tok::ellipsis))
 Expr = Actions.ActOnPackExpansion(Expr.get(), ConsumeToken());
 else if (Tok.is(tok::code_completion)) {
 // There's nothing to suggest in here as we parsed a full expression.
 SawError = true;
 cutOffParsing();
 break;
 }
 if (Expr.isInvalid()) {
+SawError = true;
+if (FailImmediatelyOnInvalidExpr)
+break;
 SkipUntil(tok::comma, tok::r_paren, StopBeforeMatch);
-SawError = true;
 } else {
 Exprs.push_back(Expr.get());
 }
 if (Tok.isNot(tok::comma))
 ///         simple-expression-list , assignment-expression
 /// \endverbatim
 bool
 Parser::ParseSimpleExpressionList(SmallVectorImpl<Expr*> &Exprs,
 SmallVectorImpl<SourceLocation> &CommaLocs) {
-while (1) {
+while (true) {
 ExprResult Expr = ParseAssignmentExpression();
 if (Expr.isInvalid())
 return true;
 Exprs.push_back(Expr.get());
-if (Tok.isNot(tok::comma))
+// We might be parsing the LHS of a fold-expression. If we reached the fold
+// operator, stop.
+if (Tok.isNot(tok::comma) || NextToken().is(tok::ellipsis))
 return false;
 // Move to the next argument, remember where the comma was.
 Token Comma = Tok;
 CommaLocs.push_back(ConsumeToken());
 // Parse the specifier-qualifier-list piece.
 DeclSpec DS(AttrFactory);
 ParseSpecifierQualifierList(DS);
 // Parse the block-declarator.
-Declarator DeclaratorInfo(DS, DeclaratorContext::BlockLiteral);
+Declarator DeclaratorInfo(DS, ParsedAttributesView::none(),
+DeclaratorContext::BlockLiteral);
 DeclaratorInfo.setFunctionDefinitionKind(FunctionDefinitionKind::Definition);
 ParseDeclarator(DeclaratorInfo);
 MaybeParseGNUAttributes(DeclaratorInfo);
 // Inform sema that we are starting a block.
 Actions.ActOnBlockStart(CaretLoc, getCurScope());
 // Parse the return type if present.
 DeclSpec DS(AttrFactory);
-Declarator ParamInfo(DS, DeclaratorContext::BlockLiteral);
+Declarator ParamInfo(DS, ParsedAttributesView::none(),
+DeclaratorContext::BlockLiteral);
 ParamInfo.setFunctionDefinitionKind(FunctionDefinitionKind::Definition);
 // FIXME: Since the return type isn't actually parsed, it can't be used to
 // fill ParamInfo with an initial valid range, so do it manually.
 ParamInfo.SetSourceRange(SourceRange(Tok.getLocation(), Tok.getLocation()));

Mercurial > hg > CbC > CbC_llvm

comparison clang/lib/Parse/ParseExpr.cpp @ 239:173fe712db74