Skip to content

Commit

Permalink
[InstCombine] Bail out of casting calls when a conversion from/to byv…
Browse files Browse the repository at this point in the history
…al is involved.

Fixes #58307

Reviewed By: nikic

Differential Revision: https://reviews.llvm.org/D135738

(cherry picked from commit 86e57e6)
  • Loading branch information
glandium authored and tru committed Oct 24, 2022
1 parent ceee53c commit 455e1d7
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 2 deletions.
4 changes: 4 additions & 0 deletions llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3289,6 +3289,10 @@ bool InstCombinerImpl::transformConstExprCastCall(CallBase &Call) {
if (CallerPAL.hasParamAttr(i, Attribute::SwiftError))
return false;

if (CallerPAL.hasParamAttr(i, Attribute::ByVal) !=
Callee->getAttributes().hasParamAttr(i, Attribute::ByVal))
return false; // Cannot transform to or from byval.

// If the parameter is passed as a byval argument, then we have to have a
// sized type and the sized type has to have the same size as the old type.
if (ParamTy != ActTy && CallerPAL.hasParamAttr(i, Attribute::ByVal)) {
Expand Down
3 changes: 1 addition & 2 deletions llvm/test/Transforms/InstCombine/byval.ll
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ declare void @add_byval_callee_2(double* byval(double))

define void @add_byval(i64* %in) {
; CHECK-LABEL: @add_byval(
; CHECK-NEXT: [[TMP1:%.*]] = bitcast i64* [[IN:%.*]] to double*
; CHECK-NEXT: call void @add_byval_callee(double* byval(double) [[TMP1]])
; CHECK-NEXT: call void bitcast (void (double*)* @add_byval_callee to void (i64*)*)(i64* byval(i64) [[IN:%.*]])
; CHECK-NEXT: ret void
;
%tmp = bitcast void (double*)* @add_byval_callee to void (i64*)*
Expand Down
31 changes: 31 additions & 0 deletions llvm/test/Transforms/InstCombine/cast-byval.ll
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
; Check that function calls involving conversion from/to byval aren't transformed.
; RUN: opt < %s -passes=instcombine -S | FileCheck %s

%Foo = type { i64 }
define i64 @foo (ptr byval(%Foo) %foo) {
; CHECK-LABEL: @foo(
; CHECK-NEXT: [[TMP1:%.*]] = load i64, ptr [[FOO:%.*]], align 4
; CHECK-NEXT: ret i64 [[TMP1]]
;
%1 = load i64, ptr %foo, align 4
ret i64 %1
}

define i64 @bar(i64 %0) {
; CHECK-LABEL: @bar(
; CHECK-NEXT: [[TMP2:%.*]] = tail call i64 @foo(i64 [[TMP0:%.*]])
; CHECK-NEXT: ret i64 [[TMP2]]
;
%2 = tail call i64 @foo(i64 %0)
ret i64 %2
}

define i64 @qux(ptr byval(%Foo) %qux) {
; CHECK-LABEL: @qux(
; CHECK-NEXT: [[TMP1:%.*]] = tail call i64 @bar(ptr nonnull byval([[FOO:%.*]]) [[QUX:%.*]])
; CHECK-NEXT: ret i64 [[TMP1]]
;
%1 = tail call i64 @bar(ptr byval(%Foo) %qux)
ret i64 %1
}

0 comments on commit 455e1d7

Please sign in to comment.