[IRLinker] Replace CallInstr with CallBase

[gulfem]

Summary

This patch replaces CallInstr with CallBase to cover InvokeInstr
besides CallInstr while removing nocallback attribute on a call site.
It also extends drop-attribute.ll test to include a case for an invoke
instruction.

[arsenm]

Needs test

[gulfem]

In D141740#4053365, @arsenm wrote:

Needs test

What kind of test would be good to add here?
I had a test (drop-attribute.ll) in D137360, that checks the usage of updateAttributes functionality. Do you suggest extending that for invoke instruction?

[tejohnson]

In D141740#4063865, @gulfem wrote:

In D141740#4053365, @arsenm wrote:

Needs test

What kind of test would be good to add here?
I had a test (drop-attribute.ll) in D137360, that checks the usage of updateAttributes functionality. Do you suggest extending that for invoke instruction?

I think you could just extend that test to include an invoke instruction and confirm it is handled correctly.

[gulfem]

Extend drop-attribute.ll test to include a case for invoke instruction.

[gulfem]

Fixed the typo in the comment.

[tejohnson]

lgtm with one test fix noted below. Thanks for the fix!

llvm/test/Linker/drop-attribute.ll

14

I think you need to add the {{$}} at the end to make sure the nocallback attribute is gone.

[gulfem]

Addressed tejohnson's feedback.

llvm/lib/Linker/IRMover.cpp

void IRLinker::updateAttributes(GlobalValue &GV) {
   /// it has no effect on definitions in the same module.
   if (auto *F = dyn_cast<Function>(&GV)) {
     if (!F->isIntrinsic())
       F->removeFnAttr(llvm::Attribute::NoCallback);
 
     // Remove nocallback attribute when it is on a call-site.
     for (BasicBlock &BB : *F)
       for (Instruction &I : BB)
-        if (CallInst *CI = dyn_cast<CallInst>(&I))
+        if (CallBase *CI = dyn_cast<CallBase>(&I))
           CI->removeFnAttr(Attribute::NoCallback);
   }
 }
 
 Error IRLinker::run() {
   // Ensure metadata materialized before value mapping.
   if (SrcM->getMaterializer())
     if (Error Err = SrcM->getMaterializer()->materializeMetadata())

llvm/test/Linker/drop-attribute.ll

 ; RUN: llvm-link %s %p/Inputs/drop-attribute.ll -S -o - | FileCheck %s
 
 ; Test case that checks that nocallback attribute is dropped during linking.
 
 ; CHECK: define i32 @main()
 ; CHECK-NEXT: entry:
 ; CHECK-NEXT: call void @test_nocallback_definition()
-; Test that checks that nocallback attribute on a call-site is dropped.
+; Test that checks that nocallback attribute on a call-site in a call instruction is dropped.
 ; CHECK-NEXT: call void @test_nocallback_call_site(){{$}}
 ; CHECK-NEXT: %0 = call float @llvm.sqrt.f32(float undef)
 ; CHECK-NEXT: call void @test_nocallback_declaration_definition_not_linked_in()
 ; CHECK-NEXT: call void @test_nocallback_declaration_definition_linked_in()
-define i32 @main() {
+; Test that checks that nocallback attribute on a call-site in an invoke instruction is dropped.
+; CHECK-NEXT: invoke void @test_nocallback_call_site(){{$}}
+define i32 @main() personality i8 0 {
 entry:
   call void @test_nocallback_definition()
   call void @test_nocallback_call_site() nocallback
   call float @llvm.sqrt.f32(float undef)
   call void @test_nocallback_declaration_definition_not_linked_in()
   call void @test_nocallback_declaration_definition_linked_in()
+  invoke void @test_nocallback_call_site() nocallback
+          to label %ret unwind label %unw
+unw:
+  %tmp = landingpad i8 cleanup
+  br label %ret
+ret:
   ret i32 0
 }
 
 ; Test that checks that nocallback attribute on a definition is dropped.
 ; CHECK: define void @test_nocallback_definition()
 define void @test_nocallback_definition() nocallback {
   ret void
 }
 
-; Test that checks that nocallback attribute on a declaration when a definition is linked in is dropped.
+; Test that checks that nocallback attribute on a call site is dropped.
 ; CHECK: declare void @test_nocallback_call_site(){{$}}
 declare void @test_nocallback_call_site()
 
 ; Test that checks that nocallback attribute on an intrinsic is NOT dropped.
 ; CHECK: ; Function Attrs: nocallback nofree nosync nounwind speculatable willreturn
 ; CHECK-NEXT: declare float @llvm.sqrt.f32(float) #0
 declare float @llvm.sqrt.f32(float) nocallback
 
 ; Test that checks that nocallback attribute on a declaration when a definition is not linked in is dropped.
 ; CHECK: declare void @test_nocallback_declaration_definition_not_linked_in(){{$}}
 declare void @test_nocallback_declaration_definition_not_linked_in() nocallback
 
 ; Test that checks that nocallback attribute on a declaration when a definition is linked in is dropped.
 ; CHECK: define void @test_nocallback_declaration_definition_linked_in() {{{$}}
 declare void @test_nocallback_declaration_definition_linked_in() nocallback