authorgravatar for robin@voetter.nlRobin Voetter <robin@voetter.nl> 2023-07-01 20:25:25+02:00
committergravatar for robin@voetter.nlRobin Voetter <robin@voetter.nl> 2023-07-01 20:28:17+02:00
log13c0624f23bbf63b31ae9b8f06aa2e32c1616e94
tree04cc6726a336dacf422a2488d7a3047091a14ce5
parent0a6cd257b9c8a9093b966e3851dc8261e19b531a
signaturebadge-check Signed by SSH key SHA256:CQ99aPxq+RueiL9u7z0FEki5Fm7V6T8q4PrEGmINrA4

llvm: cast optional null ptr representation to generic address space

The panic handler expects that this value is represented with the generic address space, so cast the global to the generic address- space before caching and returning the value.

1 files changed, 10 insertions(+), 3 deletions(-)

src/codegen/llvm.zig+10-3
......@@ -2435,18 +2435,25 @@ pub const Object = struct {
24352435 .ty = ty.toType(),
24362436 .val = null_opt_usize.toValue(),
24372437 });
2438 const llvm_wanted_addrspace = toLlvmAddressSpace(.generic, target);
2439 const llvm_actual_addrspace = toLlvmGlobalAddressSpace(.generic, target);
24382440 const global = o.llvm_module.addGlobalInAddressSpace(
24392441 llvm_init.typeOf(),
24402442 "",
2441 toLlvmGlobalAddressSpace(.generic, target),
2443 llvm_actual_addrspace,
24422444 );
24432445 global.setLinkage(.Internal);
24442446 global.setUnnamedAddr(.True);
24452447 global.setAlignment(ty.toType().abiAlignment(mod));
24462448 global.setInitializer(llvm_init);
24472449
2448 o.null_opt_addr = global;
2449 return global;
2450 const addrspace_casted_global = if (llvm_wanted_addrspace != llvm_actual_addrspace)
2451 global.constAddrSpaceCast(o.context.pointerType(llvm_wanted_addrspace))
2452 else
2453 global;
2454
2455 o.null_opt_addr = addrspace_casted_global;
2456 return addrspace_casted_global;
24502457 }
24512458
24522459 /// If the llvm function does not exist, create it.