[clang] 004231a - [clang][bytecode] Check strlen impl for primitive arrays (#157494)

[via cfe-commits]

Author: Timm Baeder
Date: 2025-09-11T05:08:08+02:00
New Revision: 004231aaebdcae1c735c354a9a754ec00e4523c9

URL: https://github.com/llvm/llvm-project/commit/004231aaebdcae1c735c354a9a754ec00e4523c9
DIFF: https://github.com/llvm/llvm-project/commit/004231aaebdcae1c735c354a9a754ec00e4523c9.diff

LOG: [clang][bytecode] Check strlen impl for primitive arrays (#157494)

Fixes #157428

Added: 
    clang/test/AST/ByteCode/builtins.c

Modified: 
    clang/lib/AST/ByteCode/InterpBuiltin.cpp

Removed: 
    


################################################################################
diff  --git a/clang/lib/AST/ByteCode/InterpBuiltin.cpp b/clang/lib/AST/ByteCode/InterpBuiltin.cpp
index d418e0ac5d094..91deda980b57e 100644
--- a/clang/lib/AST/ByteCode/InterpBuiltin.cpp
+++ b/clang/lib/AST/ByteCode/InterpBuiltin.cpp
@@ -300,6 +300,9 @@ static bool interp__builtin_strlen(InterpState &S, CodePtr OpPC,
   if (!CheckDummy(S, OpPC, StrPtr.block(), AK_Read))
     return false;
 
+  if (!StrPtr.getFieldDesc()->isPrimitiveArray())
+    return false;
+
   assert(StrPtr.getFieldDesc()->isPrimitiveArray());
   unsigned ElemSize = StrPtr.getFieldDesc()->getElemSize();
 

diff  --git a/clang/test/AST/ByteCode/builtins.c b/clang/test/AST/ByteCode/builtins.c
new file mode 100644
index 0000000000000..a51260cd3431f
--- /dev/null
+++ b/clang/test/AST/ByteCode/builtins.c
@@ -0,0 +1,19 @@
+// RUN: %clang_cc1 -fexperimental-new-constant-interpreter %s -verify
+// RUN: %clang_cc1                                         %s -verify=ref
+
+// expected-no-diagnostics
+// ref-no-diagnostics
+
+extern __SIZE_TYPE__ strlen(const char *);
+
+struct str_t {
+  char s1[sizeof("a")];
+};
+static const struct str_t str1 = {"a"};
+#define str ((const char *)&str1)
+int structStrlen(void) {
+  if (strlen(str) == 1)
+    return 0;
+  return 1;
+}
+