Backport of 088bb90

(Fix removal of globals with addrspaces in removeAddrspaces (#58322))

Author: gbaraldi

src/llvm-remove-addrspaces.cpp

@@ -271,7 +271,7 @@ bool removeAddrspaces(Module &M, AddrspaceRemapFunction ASRemapper)
                 Name,
                 (GlobalVariable *)nullptr,
                 GV->getThreadLocalMode(),
-                GV->getType()->getAddressSpace());
+                cast<PointerType>(TypeRemapper.remapType(GV->getType()))->getAddressSpace());
         NGV->copyAttributesFrom(GV);
         VMap[GV] = NGV;
     }
@@ -291,7 +291,7 @@ bool removeAddrspaces(Module &M, AddrspaceRemapFunction ASRemapper)
 
         auto *NGA = GlobalAlias::create(
                 TypeRemapper.remapType(GA->getValueType()),
-                GA->getType()->getPointerAddressSpace(),
+                cast<PointerType>(TypeRemapper.remapType(GA->getType()))->getAddressSpace(),
                 GA->getLinkage(),
                 Name,
                 &M);

test/llvmpasses/remove-addrspaces.ll

@@ -13,6 +13,10 @@
 ; TYPED-SAME: {}* ({}***, {}*, [1 x i64]*)* null
 ; OPAQUE-SAME: ptr null
 
+; COM: check that the addrspace of the global itself is removed
+; OPAQUE: @ejl_enz_runtime_exc = external global {}
+@ejl_enz_runtime_exc = external addrspace(10) global {}
+
 define i64 @getindex({} addrspace(10)* nonnull align 16 dereferenceable(40)) {
 ; CHECK-LABEL: @getindex
 top:
@@ -123,6 +127,12 @@ define void @byval_type([1 x {} addrspace(10)*] addrspace(11)* byval([1 x {} add
   ret void
 }
 
+define private fastcc void @diffejulia__mapreduce_97() {
+L6:
+; OPAQUE: store atomic ptr @ejl_enz_runtime_exc, ptr null unordered
+  store atomic {} addrspace(10)* @ejl_enz_runtime_exc, {} addrspace(10)* addrspace(10)* null unordered, align 8
+  unreachable
+}
 
 ; COM: check that function attributes are preserved on declarations too
 declare void @convergent_function() #0