Author: Timm Baeder Date: 2025-01-02T10:59:08+01:00 New Revision: 34097c07e151fef0e5c645e1dac7f4872774317b
URL: https://github.com/llvm/llvm-project/commit/34097c07e151fef0e5c645e1dac7f4872774317b DIFF: https://github.com/llvm/llvm-project/commit/34097c07e151fef0e5c645e1dac7f4872774317b.diff LOG: [clang][bytecode] Consider unknown-size arrays in memcpy/memcmp (#121462) When emitting diagnostics for the number of elements. 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 e9f3303f958d3e..b5849553d0bf53 100644 --- a/clang/lib/AST/ByteCode/InterpBuiltin.cpp +++ b/clang/lib/AST/ByteCode/InterpBuiltin.cpp @@ -1871,7 +1871,9 @@ static bool interp__builtin_memcpy(InterpState &S, CodePtr OpPC, size_t RemainingDestElems; if (DestPtr.getFieldDesc()->isArray()) { DestElemType = DestPtr.getFieldDesc()->getElemQualType(); - RemainingDestElems = (DestPtr.getNumElems() - DestPtr.getIndex()); + RemainingDestElems = DestPtr.isUnknownSizeArray() + ? 0 + : (DestPtr.getNumElems() - DestPtr.getIndex()); } else { DestElemType = DestPtr.getType(); RemainingDestElems = 1; @@ -1890,7 +1892,9 @@ static bool interp__builtin_memcpy(InterpState &S, CodePtr OpPC, size_t RemainingSrcElems; if (SrcPtr.getFieldDesc()->isArray()) { SrcElemType = SrcPtr.getFieldDesc()->getElemQualType(); - RemainingSrcElems = (SrcPtr.getNumElems() - SrcPtr.getIndex()); + RemainingSrcElems = SrcPtr.isUnknownSizeArray() + ? 0 + : (SrcPtr.getNumElems() - SrcPtr.getIndex()); } else { SrcElemType = SrcPtr.getType(); RemainingSrcElems = 1; diff --git a/clang/test/AST/ByteCode/builtin-functions.cpp b/clang/test/AST/ByteCode/builtin-functions.cpp index 0188e8297db528..723764010d9a3a 100644 --- a/clang/test/AST/ByteCode/builtin-functions.cpp +++ b/clang/test/AST/ByteCode/builtin-functions.cpp @@ -1263,6 +1263,15 @@ namespace BuiltinMemcpy { return arr[0].ok() && arr[1].ok() && arr[2].ok(); } static_assert(test_trivial()); + + // Check that an incomplete array is rejected. + constexpr int test_incomplete_array_type() { // both-error {{never produces a constant}} + extern int arr[]; + __builtin_memmove(arr, arr, 4 * sizeof(arr[0])); + // both-note@-1 2{{'memmove' not supported: source is not a contiguous array of at least 4 elements of type 'int'}} + return arr[0] * 1000 + arr[1] * 100 + arr[2] * 10 + arr[3]; + } + static_assert(test_incomplete_array_type() == 1234); // both-error {{constant}} both-note {{in call}} } namespace Memcmp { _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
