Commit 13c0624f23bbf63b31ae9b8f06aa2e32c1616e94 | zig

author	Robin Voetter <robin@voetter.nl> 2023-07-01 20:25:25+02:00
committer	Robin Voetter <robin@voetter.nl> 2023-07-01 20:28:17+02:00
log	13c0624f23bbf63b31ae9b8f06aa2e32c1616e94
tree	04cc6726a336dacf422a2488d7a3047091a14ce5
parent	0a6cd257b9c8a9093b966e3851dc8261e19b531a
signature	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

src/codegen/llvm.zig+10-3

 @@ -2435,18 +2435,25 @@ pub const Object = struct {
             .ty = ty.toType(),
             .val = null_opt_usize.toValue(),
         });
+        const llvm_wanted_addrspace = toLlvmAddressSpace(.generic, target);
+        const llvm_actual_addrspace = toLlvmGlobalAddressSpace(.generic, target);
         const global = o.llvm_module.addGlobalInAddressSpace(
             llvm_init.typeOf(),
             "",
-            toLlvmGlobalAddressSpace(.generic, target),
+            llvm_actual_addrspace,
         );
         global.setLinkage(.Internal);
         global.setUnnamedAddr(.True);
         global.setAlignment(ty.toType().abiAlignment(mod));
         global.setInitializer(llvm_init);
-        o.null_opt_addr = global;
+        const addrspace_casted_global = if (llvm_wanted_addrspace != llvm_actual_addrspace)
-        return global;
+            global.constAddrSpaceCast(o.context.pointerType(llvm_wanted_addrspace))
+        else
+            global;
+        o.null_opt_addr = addrspace_casted_global;
+        return addrspace_casted_global;
     }
     /// If the llvm function does not exist, create it.