1- From ba8ba39245d7c3d48f2a7a0efcb116015e1dfd1c Mon Sep 17 00:00:00 2001
1+ From b273b5e4b2efa033842681d705858c632138b067 Mon Sep 17 00:00:00 2001
2233Date: Sat, 4 Jan 2025 16:48:45 +0000
44Subject: [PATCH] 29e467fc78eb8b4308b57272ca4ad0d1f744f25f
@@ -62,7 +62,7 @@ index d91da9c64c..d0adcb2136 100644
6262 auto FT = FunctionType::get(T_int32, {T_pvoid, T_int32, T_pvoid}, false);
6363 auto F = Function::Create(FT, Function::ExternalLinkage, "_DllMainCRTStartup", metadataM);
6464diff --git a/src/ccall.cpp b/src/ccall.cpp
65- index 1412d7b2be..a0b7bf4a17 100644
65+ index 7c47dcdc5d..801b6ac12a 100644
6666--- a/src/ccall.cpp
6767+++ b/src/ccall.cpp
6868@@ -105,7 +105,7 @@ static bool runtime_sym_gvs(jl_codectx_t &ctx, const char *f_lib, const char *f_
@@ -111,7 +111,7 @@ index 1412d7b2be..a0b7bf4a17 100644
111111 setName(ctx.emission_context, llvmf, "ccall_fptr");
112112 }
113113diff --git a/src/cgutils.cpp b/src/cgutils.cpp
114- index c1796d907e..03335cf156 100644
114+ index e1accc823f..0aae54b41f 100644
115115--- a/src/cgutils.cpp
116116+++ b/src/cgutils.cpp
117117@@ -123,7 +123,7 @@ static Value *stringConstPtr(
@@ -133,7 +133,7 @@ index c1796d907e..03335cf156 100644
133133 for_each_uniontype_small(
134134 [&](unsigned idx, jl_datatype_t *jt) {
135135diff --git a/src/codegen.cpp b/src/codegen.cpp
136- index 2da744e48c..7eb7be3fee 100644
136+ index ae529bc412..8866dcf2f1 100644
137137--- a/src/codegen.cpp
138138+++ b/src/codegen.cpp
139139@@ -824,7 +824,7 @@ static const auto jlhasnofield_func = new JuliaFunction<>{
@@ -207,7 +207,7 @@ index 2da744e48c..7eb7be3fee 100644
207207 T}, // %f
208208 true); }, // %args
209209 get_attrs_basic,
210- @@ -5516 ,7 +5516 ,7 @@ static jl_cgval_t emit_call_specfun_boxed(jl_codectx_t &ctx, jl_value_t *jlretty
210+ @@ -5375 ,7 +5375 ,7 @@ static jl_cgval_t emit_call_specfun_boxed(jl_codectx_t &ctx, jl_value_t *jlretty
211211 std::string namep("p");
212212 namep += specFunctionObject;
213213 GlobalVariable *GV = cast_or_null<GlobalVariable>(jl_Module->getNamedValue(namep));
@@ -216,7 +216,7 @@ index 2da744e48c..7eb7be3fee 100644
216216 if (GV == nullptr) {
217217 GV = new GlobalVariable(*jl_Module, pfunc, false,
218218 GlobalVariable::ExternalLinkage,
219- @@ -8290 ,7 +8290 ,7 @@ static jl_returninfo_t get_specsig_function(jl_codegen_params_t ¶ms, Module
219+ @@ -8159 ,7 +8159 ,7 @@ static jl_returninfo_t get_specsig_function(jl_codegen_params_t ¶ms, Module
220220 if (props.union_bytes) {
221221 props.cc = jl_returninfo_t::Union;
222222 Type *AT = ArrayType::get(getInt8Ty(M->getContext()), props.union_bytes);
@@ -225,7 +225,7 @@ index 2da744e48c..7eb7be3fee 100644
225225 argnames.push_back("union_bytes_return");
226226 Type *pair[] = { T_prjlvalue, getInt8Ty(M->getContext()) };
227227 rt = StructType::get(M->getContext(), ArrayRef<Type*>(pair));
228- @@ -8319 ,7 +8319 ,7 @@ static jl_returninfo_t get_specsig_function(jl_codegen_params_t ¶ms, Module
228+ @@ -8188 ,7 +8188 ,7 @@ static jl_returninfo_t get_specsig_function(jl_codegen_params_t ¶ms, Module
229229 props.union_align = props.union_minalign = julia_alignment(jlrettype);
230230 // sret is always passed from alloca
231231 assert(M);
@@ -314,7 +314,7 @@ index d474fb4f61..cfdb8eb5b1 100644
314314 F->setMemoryEffects(MemoryEffects::inaccessibleOrArgMemOnly());
315315 }
316316diff --git a/src/llvm-final-gc-lowering.cpp b/src/llvm-final-gc-lowering.cpp
317- index 76dcd94489..4e539fea8f 100644
317+ index 5525d079d3..7d3a233c0a 100644
318318--- a/src/llvm-final-gc-lowering.cpp
319319+++ b/src/llvm-final-gc-lowering.cpp
320320@@ -22,7 +22,7 @@ void FinalLowerGC::lowerNewGCFrame(CallInst *target, Function &F)
@@ -327,10 +327,10 @@ index 76dcd94489..4e539fea8f 100644
327327
328328 // Zero out the GC frame.
329329diff --git a/src/llvm-late-gc-lowering.cpp b/src/llvm-late-gc-lowering.cpp
330- index 86b413311f..28d0e80b6d 100644
330+ index af14341ed4..d9fdb39ffb 100644
331331--- a/src/llvm-late-gc-lowering.cpp
332332+++ b/src/llvm-late-gc-lowering.cpp
333- @@ -1993 ,7 +1993 ,7 @@ bool LateLowerGCFrame::CleanupIR(Function &F, State *S, bool *CFGModified) {
333+ @@ -2025 ,7 +2025 ,7 @@ bool LateLowerGCFrame::CleanupIR(Function &F, State *S, bool *CFGModified) {
334334 AllocaInst *Frame = nullptr;
335335 unsigned allocaAddressSpace = F.getParent()->getDataLayout().getAllocaAddrSpace();
336336 if (T_prjlvalue) {
@@ -339,7 +339,7 @@ index 86b413311f..28d0e80b6d 100644
339339 Frame = new AllocaInst(T_prjlvalue, allocaAddressSpace,
340340 ConstantInt::get(T_int32, maxframeargs), "jlcallframe", StartOff->getIterator());
341341 }
342- @@ -2184 ,7 +2184 ,7 @@ bool LateLowerGCFrame::CleanupIR(Function &F, State *S, bool *CFGModified) {
342+ @@ -2218 ,7 +2218 ,7 @@ bool LateLowerGCFrame::CleanupIR(Function &F, State *S, bool *CFGModified) {
343343 }
344344 ReplacementArgs.push_back(nframeargs == 0 ?
345345 (llvm::Value*)ConstantPointerNull::get(T_pprjlvalue) :
@@ -376,10 +376,10 @@ index 2961a77e08..61058f7af0 100644
376376 auto tgt = linearized[i];
377377 auto &spec = specs[i];
378378diff --git a/src/llvm-pass-helpers.cpp b/src/llvm-pass-helpers.cpp
379- index 9d415d923e..214e99a03d 100644
379+ index 38716cba52..30a6e0b37f 100644
380380--- a/src/llvm-pass-helpers.cpp
381381+++ b/src/llvm-pass-helpers.cpp
382- @@ -255 ,7 +255 ,7 @@ namespace jl_intrinsics {
382+ @@ -240 ,7 +240 ,7 @@ namespace jl_intrinsics {
383383 SAFEPOINT_NAME,
384384 [](Type *T_size) {
385385 auto &ctx = T_size->getContext();
@@ -389,7 +389,7 @@ index 9d415d923e..214e99a03d 100644
389389 FunctionType::get(
390390 Type::getVoidTy(ctx),
391391diff --git a/src/llvm-ptls.cpp b/src/llvm-ptls.cpp
392- index 58fdd8aafa..1bc05c4ce0 100644
392+ index a2e783d7ef..b87a5cfc32 100644
393393--- a/src/llvm-ptls.cpp
394394+++ b/src/llvm-ptls.cpp
395395@@ -312,7 +312,7 @@ bool LowerPTLS::run(bool *CFGModified)
0 commit comments