Skip to content

[Clang][Parser] Fix assertion failure with explicit(bool) in pre-C++20 modes #152896

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions clang/include/clang/Basic/DiagnosticParseKinds.td
Original file line number Diff line number Diff line change
Expand Up @@ -842,6 +842,8 @@ def warn_cxx17_compat_explicit_bool : Warning<
InGroup<CXXPre20Compat>, DefaultIgnore;
def ext_explicit_bool : ExtWarn<"explicit(bool) is a C++20 extension">,
InGroup<CXX20>;
def err_explicit_bool_requires_cpp20
: Error<"explicit(bool) requires C++20 or later">;

/// C++ Templates
def err_expected_template : Error<"expected template">;
Expand Down
78 changes: 58 additions & 20 deletions clang/lib/Parse/ParseDecl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4174,28 +4174,66 @@ void Parser::ParseDeclarationSpecifiers(
ConsumedEnd = ExplicitLoc;
ConsumeToken(); // kw_explicit
if (Tok.is(tok::l_paren)) {
if (getLangOpts().CPlusPlus20 || isExplicitBool() == TPResult::True) {
Diag(Tok.getLocation(), getLangOpts().CPlusPlus20
? diag::warn_cxx17_compat_explicit_bool
: diag::ext_explicit_bool);

ExprResult ExplicitExpr(static_cast<Expr *>(nullptr));
BalancedDelimiterTracker Tracker(*this, tok::l_paren);
Tracker.consumeOpen();

EnterExpressionEvaluationContext ConstantEvaluated(
Actions, Sema::ExpressionEvaluationContext::ConstantEvaluated);
TPResult ExplicitBoolResult = isExplicitBool();
if (getLangOpts().CPlusPlus20) {
// C++20: Support explicit(bool) with compatibility warning
if (ExplicitBoolResult == TPResult::True ||
ExplicitBoolResult == TPResult::Ambiguous) {
Diag(Tok.getLocation(), diag::warn_cxx17_compat_explicit_bool);

ExprResult ExplicitExpr(static_cast<Expr *>(nullptr));
BalancedDelimiterTracker Tracker(*this, tok::l_paren);
Tracker.consumeOpen();

EnterExpressionEvaluationContext ConstantEvaluated(
Actions, Sema::ExpressionEvaluationContext::ConstantEvaluated);

ExplicitExpr = ParseConstantExpressionInExprEvalContext();
ConsumedEnd = Tok.getLocation();
if (ExplicitExpr.isUsable()) {
CloseParenLoc = Tok.getLocation();
Tracker.consumeClose();
ExplicitSpec =
Actions.ActOnExplicitBoolSpecifier(ExplicitExpr.get());
} else
Tracker.skipToEnd();
}
} else if (ExplicitBoolResult == TPResult::True) {
if (getLangOpts().CPlusPlus17) {
// C++17: Allow explicit(bool) as extension for compatibility
// This maintains backward compatibility with existing code that
// relied on this extension warning behavior
Diag(Tok.getLocation(), diag::ext_explicit_bool);

ExprResult ExplicitExpr(static_cast<Expr *>(nullptr));
BalancedDelimiterTracker Tracker(*this, tok::l_paren);
Tracker.consumeOpen();

EnterExpressionEvaluationContext ConstantEvaluated(
Actions, Sema::ExpressionEvaluationContext::ConstantEvaluated);

ExplicitExpr = ParseConstantExpressionInExprEvalContext();
ConsumedEnd = Tok.getLocation();
if (ExplicitExpr.isUsable()) {
CloseParenLoc = Tok.getLocation();
Tracker.consumeClose();
ExplicitSpec =
Actions.ActOnExplicitBoolSpecifier(ExplicitExpr.get());
} else
Tracker.skipToEnd();
} else {
// C++14 and earlier: explicit(bool) causes assertion failure
// Emit proper error message instead of crashing
Diag(Tok.getLocation(), diag::err_explicit_bool_requires_cpp20);

ExplicitExpr = ParseConstantExpressionInExprEvalContext();
ConsumedEnd = Tok.getLocation();
if (ExplicitExpr.isUsable()) {
CloseParenLoc = Tok.getLocation();
Tracker.consumeClose();
ExplicitSpec =
Actions.ActOnExplicitBoolSpecifier(ExplicitExpr.get());
} else
// Error recovery: skip the parenthesized expression
BalancedDelimiterTracker Tracker(*this, tok::l_paren);
Tracker.consumeOpen();
Tracker.skipToEnd();
} else {
ConsumedEnd = Tok.getLocation();
}
} else if (ExplicitBoolResult == TPResult::Ambiguous) {
// Ambiguous case: warn about potential C++20 interpretation
Diag(Tok.getLocation(), diag::warn_cxx20_compat_explicit_bool);
}
}
Expand Down
16 changes: 16 additions & 0 deletions clang/test/Parser/explicit-bool-pre-cxx17.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// Regression test for assertion failure when explicit(bool) is used in pre-C++17
// This test ensures no crash occurs and appropriate error messages are shown.
// RUN: %clang_cc1 -std=c++03 -verify %s
// RUN: %clang_cc1 -std=c++11 -verify %s
// RUN: %clang_cc1 -std=c++14 -verify %s

struct S {
// Before the fix, this would cause assertion failure in BuildConvertedConstantExpression
// Now it should produce a proper error message in C++14 and earlier modes
// Note: C++17 allows this as an extension for compatibility
explicit(true) S(int);
// expected-error@-1 {{explicit(bool) requires C++20 or later}}

explicit(false) S(float);
// expected-error@-1 {{explicit(bool) requires C++20 or later}}
};
Loading