Skip to content

Commit

Permalink
[InlineCost] Check that function types match
Browse files Browse the repository at this point in the history
Retain the behavior we get without opaque pointers: A call to a
known function with different function type is considered an
indirect call.

This fixes the crash reported in https://reviews.llvm.org/D123300#3444772.
  • Loading branch information
nikic committed Apr 12, 2022
1 parent dbd80d7 commit 8d5c8d5
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 3 deletions.
6 changes: 3 additions & 3 deletions llvm/lib/Analysis/InlineCost.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2136,14 +2136,14 @@ bool CallAnalyzer::visitCallBase(CallBase &Call) {
if (isa<CallInst>(Call) && cast<CallInst>(Call).cannotDuplicate())
ContainsNoDuplicateCall = true;

Value *Callee = Call.getCalledOperand();
Function *F = dyn_cast_or_null<Function>(Callee);
Function *F = Call.getCalledFunction();
bool IsIndirectCall = !F;
if (IsIndirectCall) {
// Check if this happens to be an indirect function call to a known function
// in this inline context. If not, we've done all we can.
Value *Callee = Call.getCalledOperand();
F = dyn_cast_or_null<Function>(SimplifiedValues.lookup(Callee));
if (!F) {
if (!F || F->getFunctionType() != Call.getFunctionType()) {
onCallArgumentSetup(Call);

if (!Call.onlyReadsMemory())
Expand Down
27 changes: 27 additions & 0 deletions llvm/test/Transforms/Inline/opaque-ptr.ll
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
; RUN: opt -S -inline < %s | FileCheck %s

define void @test(ptr %p1, ptr %p2) {
; CHECK-LABEL: @test(
; CHECK-NEXT: ret void
;
ret void
}

define void @test1() {
; CHECK-LABEL: @test1(
; CHECK-NEXT: [[CALL_I:%.*]] = call i32 @test(ptr null)
; CHECK-NEXT: ret void
;
call void @test2(ptr @test)
ret void
}

define void @test2(ptr %i) {
; CHECK-LABEL: @test2(
; CHECK-NEXT: [[CALL:%.*]] = call i32 [[I:%.*]](ptr null)
; CHECK-NEXT: ret void
;
%call = call i32 %i(ptr null)
ret void
}

0 comments on commit 8d5c8d5

Please sign in to comment.