https://github.com/tbaederr created
https://github.com/llvm/llvm-project/pull/118460
To match the diagnostic output of the current interpreter.
>From b98163a979e323e05791c866e53cfb9a977fda52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timm=20B=C3=A4der?= <tbae...@redhat.com>
Date: Tue, 3 Dec 2024 11:14:37 +0100
Subject: [PATCH] [clang][bytecode] Reject memcpy dummy pointers after null
check
To match the diagnostic output of the current interpreter.
---
clang/lib/AST/ByteCode/InterpBuiltin.cpp | 7 ++++---
clang/test/AST/ByteCode/builtin-functions.cpp | 4 ++++
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/clang/lib/AST/ByteCode/InterpBuiltin.cpp
b/clang/lib/AST/ByteCode/InterpBuiltin.cpp
index c5473322ecb280..b788656f9484fc 100644
--- a/clang/lib/AST/ByteCode/InterpBuiltin.cpp
+++ b/clang/lib/AST/ByteCode/InterpBuiltin.cpp
@@ -1813,9 +1813,6 @@ static bool interp__builtin_memcpy(InterpState &S,
CodePtr OpPC,
bool Move = (ID == Builtin::BI__builtin_memmove || ID == Builtin::BImemmove);
- if (DestPtr.isDummy() || SrcPtr.isDummy())
- return false;
-
// If the size is zero, we treat this as always being a valid no-op.
if (Size.isZero()) {
S.Stk.push<Pointer>(DestPtr);
@@ -1830,6 +1827,10 @@ static bool interp__builtin_memcpy(InterpState &S,
CodePtr OpPC,
return false;
}
+ // As a last resort, reject dummy pointers.
+ if (DestPtr.isDummy() || SrcPtr.isDummy())
+ return false;
+
if (!DoBitCastPtr(S, OpPC, SrcPtr, DestPtr))
return false;
diff --git a/clang/test/AST/ByteCode/builtin-functions.cpp
b/clang/test/AST/ByteCode/builtin-functions.cpp
index 211ca6e164cbfb..b951c04dde5980 100644
--- a/clang/test/AST/ByteCode/builtin-functions.cpp
+++ b/clang/test/AST/ByteCode/builtin-functions.cpp
@@ -1169,6 +1169,10 @@ namespace BuiltinMemcpy {
static_assert(__builtin_memcpy(null_incomplete, null_incomplete,
sizeof(wchar_t))); // both-error {{not an integral constant expression}} \
// both-note {{source of 'memcpy' is nullptr}}
+ wchar_t global;
+ constexpr wchar_t *null = 0;
+ static_assert(__builtin_memcpy(&global, null, sizeof(wchar_t))); //
both-error {{not an integral constant expression}} \
+ //
both-note {{source of 'memcpy' is nullptr}}
constexpr int simpleMove() {
int a = 12;
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
