https://github.com/shiltian updated
https://github.com/llvm/llvm-project/pull/89567
>From 041574d22c2debb5299926b58aed529919905902 Mon Sep 17 00:00:00 2001
From: Shilei Tian <i...@tianshilei.me>
Date: Mon, 22 Apr 2024 01:09:47 -0400
Subject: [PATCH] [Clang] Fix a crash introduced in PR#88666
The unroll value can be a template variable such that we need to check it before
we verify if it is constant value.
---
clang/lib/Sema/SemaStmtAttr.cpp | 2 +-
clang/test/Sema/unroll-template-value-crash.cpp | 10 ++++++++++
2 files changed, 11 insertions(+), 1 deletion(-)
create mode 100644 clang/test/Sema/unroll-template-value-crash.cpp
diff --git a/clang/lib/Sema/SemaStmtAttr.cpp b/clang/lib/Sema/SemaStmtAttr.cpp
index 7cd494b42250d4..9d44c22c8ddcc3 100644
--- a/clang/lib/Sema/SemaStmtAttr.cpp
+++ b/clang/lib/Sema/SemaStmtAttr.cpp
@@ -109,7 +109,7 @@ static Attr *handleLoopHintAttr(Sema &S, Stmt *St, const
ParsedAttr &A,
SetHints(LoopHintAttr::Unroll, LoopHintAttr::Disable);
} else if (PragmaName == "unroll") {
// #pragma unroll N
- if (ValueExpr) {
+ if (ValueExpr && !ValueExpr->isValueDependent()) {
llvm::APSInt ValueAPS;
ExprResult R = S.VerifyIntegerConstantExpression(ValueExpr, &ValueAPS);
assert(!R.isInvalid() && "unroll count value must be a valid value, it's
"
diff --git a/clang/test/Sema/unroll-template-value-crash.cpp
b/clang/test/Sema/unroll-template-value-crash.cpp
new file mode 100644
index 00000000000000..d8953c4845c265
--- /dev/null
+++ b/clang/test/Sema/unroll-template-value-crash.cpp
@@ -0,0 +1,10 @@
+// RUN: %clang_cc1 -x c++ -verify %s
+// expected-no-diagnostics
+
+template <int Unroll> void foo() {
+ #pragma unroll Unroll
+ for (int i = 0; i < Unroll; ++i);
+
+ #pragma GCC unroll Unroll
+ for (int i = 0; i < Unroll; ++i);
+}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
