Skip to content

[coverage] fix crash in code coverage and if constexpr with ExprWithCleanups #80292

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

Merged
merged 1 commit into from
Feb 1, 2024
Merged
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
6 changes: 4 additions & 2 deletions clang/lib/CodeGen/CoverageMappingGen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1812,8 +1812,10 @@ struct CounterCoverageMappingBuilder
assert(S->isConstexpr());

// evaluate constant condition...
const auto *E = cast<ConstantExpr>(S->getCond());
const bool isTrue = E->getResultAsAPSInt().getExtValue();
const bool isTrue =
S->getCond()
->EvaluateKnownConstInt(CVM.getCodeGenModule().getContext())
.getBoolValue();

extendRegion(S);

Expand Down
29 changes: 29 additions & 0 deletions clang/test/CoverageMapping/if.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,35 @@ constexpr int check_macro_consteval_if_skipped(int i) { // CHECK-NEXT: [[@LINE
return i;
}

struct false_value {
constexpr operator bool() {
return false;
}
};

template <typename> struct dependable_false_value {
constexpr operator bool() {
return false;
}
};

// GH-80285
void should_not_crash() {
if constexpr (false_value{}) { };
}

template <typename> void should_not_crash_dependable() {
if constexpr (dependable_false_value<int>{}) { };
}

void should_not_crash_with_template_instance() {
should_not_crash_dependable<int>();
}

void should_not_crash_with_requires_expr() {
if constexpr (requires {42;}) { };
}

int instantiate_consteval(int i) {
i *= check_consteval_with_else_discarded_then(i);
i *= check_notconsteval_with_else_discarded_else(i);
Expand Down