Author: Timm Baeder Date: 2026-02-13T10:34:27+01:00 New Revision: 900fac763f65774042502d62b80233fb107c65b4
URL: https://github.com/llvm/llvm-project/commit/900fac763f65774042502d62b80233fb107c65b4 DIFF: https://github.com/llvm/llvm-project/commit/900fac763f65774042502d62b80233fb107c65b4.diff LOG: [clang][bytecode] Check strlen element size (#181333) We're otherwise running into an assertion later, so do the check early. Added: Modified: clang/lib/AST/ByteCode/InterpBuiltin.cpp clang/test/AST/ByteCode/builtin-functions.cpp Removed: ################################################################################ diff --git a/clang/lib/AST/ByteCode/InterpBuiltin.cpp b/clang/lib/AST/ByteCode/InterpBuiltin.cpp index 518738414de6b..fe704a8e27b99 100644 --- a/clang/lib/AST/ByteCode/InterpBuiltin.cpp +++ b/clang/lib/AST/ByteCode/InterpBuiltin.cpp @@ -365,6 +365,8 @@ static bool interp__builtin_strlen(InterpState &S, CodePtr OpPC, assert(StrPtr.getFieldDesc()->isPrimitiveArray()); unsigned ElemSize = StrPtr.getFieldDesc()->getElemSize(); + if (ElemSize != 1 && ElemSize != 2 && ElemSize != 4) + return Invalid(S, OpPC); if (ID == Builtin::BI__builtin_wcslen || ID == Builtin::BIwcslen) { const ASTContext &AC = S.getASTContext(); diff --git a/clang/test/AST/ByteCode/builtin-functions.cpp b/clang/test/AST/ByteCode/builtin-functions.cpp index f4a6a0be062d4..a0e8d61163eb0 100644 --- a/clang/test/AST/ByteCode/builtin-functions.cpp +++ b/clang/test/AST/ByteCode/builtin-functions.cpp @@ -21,6 +21,7 @@ #error "huh?" #endif +#define fold(x) (__builtin_constant_p(0) ? (x) : (x)) inline constexpr void* operator new(__SIZE_TYPE__, void* p) noexcept { return p; } namespace std { @@ -229,6 +230,9 @@ constexpr const char *a = "foo\0quux"; int arr[3]; // both-note {{here}} int wk = arr[wcslen(L"hello")]; // both-warning {{array index 5}} + + const long long longArray[] = {'b'}; + constexpr int m = __builtin_strlen(fold((char *)longArray)); // both-error {{must be initialized by a constant expression}} } namespace nan { @@ -1503,7 +1507,6 @@ namespace BuiltinMemcpy { } static_assert(memmoveOverlapping()); -#define fold(x) (__builtin_constant_p(0) ? (x) : (x)) static_assert(__builtin_memcpy(&global, fold((wchar_t*)123), sizeof(wchar_t))); // both-error {{not an integral constant expression}} \ // both-note {{source of 'memcpy' is (void *)123}} static_assert(__builtin_memcpy(fold(reinterpret_cast<wchar_t*>(123)), &global, sizeof(wchar_t))); // both-error {{not an integral constant expression}} \ _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
