[IRMover] Set Address Space for moved global values

[ekatz]

Summary

Set Address Space when creating a new function (from another).

Fix PR41154.

[tejohnson]

This seems fine to me, but can you pull out and commit the NFC parts first, and update the patch to just contain the functional change? It's harder to see with all the NFC changes in here. The NFC part can go in without a phabricator patch.

llvm/test/Linker/addrspace.ll

2

suggest adding an alias in here for completeness

[ekatz]

Added alias testing, and moved the NFC part into https://reviews.llvm.org/D69550.

[tejohnson]

LGTM

[ekatz]

I cannot commit this patch myself.
Please commit it, if you may, in my behalf.

Author: Ehud Katz <[e-mail]>

Thanks.

llvm/lib/Linker/IRMover.cpp

AttributeList IRLinker::mapAttributeTypes(LLVMContext &C, AttributeList Attrs) {
   return Attrs;
 }
 
 /// Link the function in the source module into the destination module if
 /// needed, setting up mapping information.
 Function *IRLinker::copyFunctionProto(const Function *SF) {
   // If there is no linkage to be performed or we are linking from the source,
   // bring SF over.
-  auto *F =
-      Function::Create(TypeMap.get(SF->getFunctionType()),
-                       GlobalValue::ExternalLinkage, SF->getName(), &DstM);
+  auto *F = Function::Create(TypeMap.get(SF->getFunctionType()),
+                             GlobalValue::ExternalLinkage,
+                             SF->getAddressSpace(), SF->getName(), &DstM);
   F->copyAttributesFrom(SF);
   F->setAttributes(mapAttributeTypes(F->getContext(), F->getAttributes()));
   return F;
 }
 
 /// Set up prototypes for any indirect symbols that come over from the source
 /// module.
 GlobalValue *
GlobalValue *IRLinker::copyGlobalValueProto(const GlobalValue *SGV,
   } else if (auto *SF = dyn_cast<Function>(SGV)) {
     NewGV = copyFunctionProto(SF);
   } else {
     if (ForDefinition)
       NewGV = copyGlobalIndirectSymbolProto(cast<GlobalIndirectSymbol>(SGV));
     else if (SGV->getValueType()->isFunctionTy())
       NewGV =
           Function::Create(cast<FunctionType>(TypeMap.get(SGV->getValueType())),
-                           GlobalValue::ExternalLinkage, SGV->getName(), &DstM);
+                           GlobalValue::ExternalLinkage, SGV->getAddressSpace(),
+                           SGV->getName(), &DstM);
     else
       NewGV = new GlobalVariable(
           DstM, TypeMap.get(SGV->getValueType()),
           /*isConstant*/ false, GlobalValue::ExternalLinkage,
           /*init*/ nullptr, SGV->getName(),
           /*insertbefore*/ nullptr, SGV->getThreadLocalMode(),
           SGV->getType()->getAddressSpace());
   }

llvm/test/Linker/addrspace.ll

+; RUN: llvm-link %s -S | FileCheck %s
+
+@G = addrspace(2) global i32 256 
+; CHECK: @G = addrspace(2) global i32
+
+@GA = alias i32, i32 addrspace(2)* @G
+; CHECK: @GA = alias i32, i32 addrspace(2)* @G
+
+define void @foo() addrspace(3) {
+; CHECK: define void @foo() addrspace(3)
+  ret void
+}