....

Author: yuyichao

deps/LLVMExtra/include/LLVMExtra.h

@@ -160,7 +160,7 @@ void LLVMReplaceMDNodeOperandWith(LLVMValueRef V, unsigned Index,
 // Constant data
 #if LLVM_VERSION_MAJOR < 21
 LLVMValueRef LLVMConstDataArray(LLVMTypeRef ElementTy, const void *Data,
-                                unsigned NumElements);
+                                size_t SizeInBytes);
 #endif
 
 // Missing opaque pointer APIs

deps/LLVMExtra/lib/Core.cpp

@@ -571,10 +571,10 @@ void LLVMReplaceMDNodeOperandWith(LLVMValueRef V, unsigned Index,
 
 #if LLVM_VERSION_MAJOR < 21
 LLVMValueRef LLVMConstDataArray(LLVMTypeRef ElementTy, const void *Data,
-                                unsigned NumElements) {
-  StringRef S((const char *)Data,
-              NumElements * unwrap(ElementTy)->getPrimitiveSizeInBits() / 8);
-  return wrap(ConstantDataArray::getRaw(S, NumElements, unwrap(ElementTy)));
+                                size_t SizeInBytes) {
+  Type *Ty = unwrap(ElementTy);
+  size_t Len = SizeInBytes / (Ty->getPrimitiveSizeInBits() / 8);
+  return wrap(ConstantDataArray::getRaw(StringRef((const char*)Data, SizeInBytes), Len, Ty));
 }
 #endif
 

src/core/value/constant.jl

@@ -270,7 +270,7 @@ Create a constant array of simple data values of the given type and data.
 function ConstantDataArray(typ::LLVMType, data::AbstractVector{T}) where {T <: Union{Integer, AbstractFloat}}
     # TODO: can we look up the primitive size of the LLVM type?
     #       use that to assert it matches the Julia element type.
-    return ConstantDataArray(API.LLVMConstDataArray(typ, data, length(data)))
+    return ConstantDataArray(API.LLVMConstDataArray(typ, data, sizeof(data)))
 end
 
 """