https://github.com/tbaederr created https://github.com/llvm/llvm-project/pull/141474
Both Expr::isIntegerConstantExpr() and Epxr::EvaluateKnownConstInt() evaluate the expression. Just do it once and check the integer result. >From 000188d3650923c7747aeeb8f7d02786f8243bf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timm=20B=C3=A4der?= <tbae...@redhat.com> Date: Mon, 26 May 2025 12:38:22 +0200 Subject: [PATCH] [clang][OpenCL] Only evaluate initializer once to check for zero init Both Expr::isIntegerConstantExpr() and Epxr::EvaluateKnownConstInt() evaluate the expression. Just do it once and check the integer result. --- clang/lib/Sema/SemaInit.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp index 2f682dbc1f000..776cb022e6925 100644 --- a/clang/lib/Sema/SemaInit.cpp +++ b/clang/lib/Sema/SemaInit.cpp @@ -6410,9 +6410,9 @@ static bool TryOCLSamplerInitialization(Sema &S, return true; } -static bool IsZeroInitializer(Expr *Initializer, Sema &S) { - return Initializer->isIntegerConstantExpr(S.getASTContext()) && - (Initializer->EvaluateKnownConstInt(S.getASTContext()) == 0); +static bool IsZeroInitializer(const Expr *Init, ASTContext &Ctx) { + std::optional<llvm::APSInt> Value = Init->getIntegerConstantExpr(Ctx); + return Value && Value->isZero(); } static bool TryOCLZeroOpaqueTypeInitialization(Sema &S, @@ -6431,7 +6431,7 @@ static bool TryOCLZeroOpaqueTypeInitialization(Sema &S, // event should be zero. // if (DestType->isEventT() || DestType->isQueueT()) { - if (!IsZeroInitializer(Initializer, S)) + if (!IsZeroInitializer(Initializer, S.getASTContext())) return false; Sequence.AddOCLZeroOpaqueTypeStep(DestType); @@ -6447,7 +6447,7 @@ static bool TryOCLZeroOpaqueTypeInitialization(Sema &S, if (DestType->isOCLIntelSubgroupAVCMcePayloadType() || DestType->isOCLIntelSubgroupAVCMceResultType()) return false; - if (!IsZeroInitializer(Initializer, S)) + if (!IsZeroInitializer(Initializer, S.getASTContext())) return false; Sequence.AddOCLZeroOpaqueTypeStep(DestType); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits