llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang Author: Timm Baeder (tbaederr) <details> <summary>Changes</summary> We used to accept c++ as a known value here, causing wrong codegen. --- Full diff: https://github.com/llvm/llvm-project/pull/135548.diff 2 Files Affected: - (modified) clang/lib/AST/ByteCode/Interp.h (+5) - (modified) clang/test/AST/ByteCode/codegen.cpp (+10-1) ``````````diff diff --git a/clang/lib/AST/ByteCode/Interp.h b/clang/lib/AST/ByteCode/Interp.h index 4e84dcc8d551d..b4e15b3ffbe68 100644 --- a/clang/lib/AST/ByteCode/Interp.h +++ b/clang/lib/AST/ByteCode/Interp.h @@ -771,6 +771,11 @@ bool IncDecHelper(InterpState &S, CodePtr OpPC, const Pointer &Ptr, bool CanOverflow) { assert(!Ptr.isDummy()); + if (!S.inConstantContext()) { + if (isConstexprUnknown(Ptr)) + return false; + } + if constexpr (std::is_same_v<T, Boolean>) { if (!S.getLangOpts().CPlusPlus14) return Invalid(S, OpPC); diff --git a/clang/test/AST/ByteCode/codegen.cpp b/clang/test/AST/ByteCode/codegen.cpp index ea2c812f30f6f..7c853a20362b8 100644 --- a/clang/test/AST/ByteCode/codegen.cpp +++ b/clang/test/AST/ByteCode/codegen.cpp @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -triple x86_64-linux -emit-llvm -o - %s | FileCheck %s +// RUN: %clang_cc1 -triple x86_64-linux -emit-llvm -o - %s | FileCheck %s // RUN: %clang_cc1 -triple x86_64-linux -emit-llvm -o - %s -fexperimental-new-constant-interpreter | FileCheck %s #ifdef __SIZEOF_INT128__ @@ -95,3 +95,12 @@ void f(A *a) { // CHECK: call void @_ZN1AD1Ev( A::E e3 = A().Foo; } + +int notdead() { + auto l = [c=0]() mutable { + return c++ < 5 ? 10 : 12; + }; + return l(); +} +// CHECK: _ZZ7notdeadvEN3$_0clEv +// CHECK: ret i32 %cond `````````` </details> https://github.com/llvm/llvm-project/pull/135548 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
