Skip to content

ConditionForwarding: fix a wrong assert #77853

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 2, 2024
Merged

ConditionForwarding: fix a wrong assert #77853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/SILOptimizer/Transforms/ConditionForwarding.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ bool ConditionForwarding::tryOptimize(SwitchEnumInst *SEI) {
if (getFunction()->hasOwnership()) {
// TODO: Currently disabled because this case may need lifetime extension
// Disabling this conservatively for now.
assert(Condition->getNumOperands() == 1);
assert(Condition->getNumRealOperands() == 1);
BorrowedValue conditionOp(Condition->getOperand(0));
if (conditionOp && conditionOp.isLocalScope()) {
return false;
Expand Down
31 changes: 31 additions & 0 deletions test/SILOptimizer/conditionforwarding_ossa.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ class C {
init()
}

final class D: C {}

sil [ossa] @callee : $@convention(thin) () -> ()
sil [ossa] @use_enum : $@convention(thin) (E) -> ()
sil [ossa] @use_int : $@convention(thin) (Builtin.Int64) -> ()
Expand Down Expand Up @@ -388,3 +390,32 @@ bb6:
return %r : $()
}

// CHECK-LABEL: sil [ossa] @cast_with_type_dependent_operand :
// CHECK-NOT: switch_enum
// CHECK-LABEL: } // end sil function 'cast_with_type_dependent_operand'
sil [ossa] @cast_with_type_dependent_operand : $@convention(method) (@guaranteed C, @guaranteed D) -> () {
bb0(%0 : @guaranteed $C, %1 : @guaranteed $D):
checked_cast_br C in %0 to @dynamic_self D, bb1, bb2

bb1(%3 : @guaranteed $D):
%4 = enum $Optional<D>, #Optional.some!enumelt, %3
br bb3(%4)

bb2(%6 : @guaranteed $C):
%7 = enum $Optional<D>, #Optional.none!enumelt
br bb3(%7)

bb3(%9 : @guaranteed $Optional<D>):
%10 = borrowed %9 from (%0)
switch_enum %10, case #Optional.some!enumelt: bb4, case #Optional.none!enumelt: bb5

bb4(%12 : @guaranteed $D):
br bb6

bb5:
br bb6

bb6:
%15 = tuple ()
return %15
}