maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Linker: Fix linking of byref types 

This wasn't properly remapping the type like with the other
attributes, so this would end up hitting a verifier error after
linking different modules using byref.
This commit is contained in:
Matt Arsenault 2020-11-17 10:47:43 -05:00
parent e67d8859f2
commit c5ce6036c1
4 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/lib/Linker/IRMover.cpp
View File

@ -639,7 +639,7 @@ GlobalVariable *IRLinker::copyGlobalVariableProto(const GlobalVariable *SGVar) {
AttributeList IRLinker::mapAttributeTypes(LLVMContext &C, AttributeList Attrs) {
for (unsigned i = 0; i < Attrs.getNumAttrSets(); ++i) {
for (Attribute::AttrKind TypedAttr :
{Attribute::ByVal, Attribute::StructRet}) {
{Attribute::ByVal, Attribute::StructRet, Attribute::ByRef}) {
if (Attrs.hasAttribute(i, TypedAttr)) {
if (Type *Ty = Attrs.getAttribute(i, TypedAttr).getValueAsType()) {
Attrs = Attrs.replaceAttributeType(C, i, TypedAttr, TypeMap.get(Ty));

2
llvm/lib/Transforms/Utils/ValueMapper.cpp
View File

@ -901,7 +901,7 @@ void Mapper::remapInstruction(Instruction *I) {
AttributeList Attrs = CB->getAttributes();
for (unsigned i = 0; i < Attrs.getNumAttrSets(); ++i) {
for (Attribute::AttrKind TypedAttr :
{Attribute::ByVal, Attribute::StructRet}) {
{Attribute::ByVal, Attribute::StructRet, Attribute::ByRef}) {
if (Type *Ty = Attrs.getAttribute(i, TypedAttr).getValueAsType()) {
Attrs = Attrs.replaceAttributeType(C, i, TypedAttr,
TypeMapper->remapType(Ty));

13
llvm/test/Linker/Inputs/byref-type-input.ll Normal file
View File

@ -0,0 +1,13 @@
%a = type { i64 }
%struct = type { i32, i8 }
define void @g(%a* byref(%a)) {
ret void
}
declare void @baz(%struct* byref(%struct))
define void @foo(%struct* byref(%struct) %a) {
call void @baz(%struct* byref(%struct) %a)
ret void
}

25
llvm/test/Linker/byref-types.ll Normal file
View File

@ -0,0 +1,25 @@
; RUN: llvm-link %s %p/Inputs/byref-type-input.ll -S | FileCheck %s
%a = type { i64 }
%struct = type { i32, i8 }
; CHECK-LABEL: define void @f(%a* byref(%a) %0)
define void @f(%a* byref(%a)) {
ret void
}
; CHECK-LABEL: define void @bar(
; CHECK: call void @foo(%struct* byref(%struct) %ptr)
define void @bar() {
%ptr = alloca %struct
call void @foo(%struct* byref(%struct) %ptr)
ret void
}
; CHECK-LABEL: define void @g(%a* byref(%a) %0)
; CHECK-LABEL: define void @foo(%struct* byref(%struct) %a)
; CHECK-NEXT: call void @baz(%struct* byref(%struct) %a)
declare void @foo(%struct* byref(%struct) %a)
; CHECK: declare void @baz(%struct* byref(%struct))