Skip to content

Commit 3ffc1f9

Browse files
rjmccallrjmccall
authored
Merge pull request #81377 from rjmccall/fix-iso-def-arg-idx-calc-6.2
[6.2] Fix argument index calculations for isolated default arguments
2 parents 8e30d7f + 59c3d58 commit 3ffc1f9

File tree

2 files changed

+168
-5
lines changed

2 files changed

+168
-5
lines changed

‎lib/SILGen/SILGenApply.cpp

Lines changed: 45 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3040,13 +3040,22 @@ static void emitDelayedArguments(SILGenFunction &SGF,
30403040
// up in parallel, with empty spots being dropped into 'args'
30413041
// wherever there's a delayed argument to insert.
30423042
//
3043+
// Note that siteArgs has exactly one empty element for each
3044+
// delayed argument, even if the argument actually expands to
3045+
// zero or multiple SIL values. In such cases, we may have to
3046+
// remove or add elements to fill in the actual argument values.
3047+
//
30433048
// Note that this also begins the formal accesses in evaluation order.
30443049
for (auto argsIt = args.begin(); argsIt != args.end(); ++argsIt) {
30453050
auto &siteArgs = *argsIt;
30463051
// NB: siteArgs.size() may change during iteration
30473052
for (size_t i = 0; i < siteArgs.size(); ) {
30483053
auto &siteArg = siteArgs[i];
30493054

3055+
// Skip slots in the argument array that we've already filled in.
3056+
// Note that this takes advantage of the "exactly one element"
3057+
// assumption above, since default arguments might have () type
3058+
// and therefore expand to no actual argument slots.
30503059
if (siteArg) {
30513060
++i;
30523061
continue;
@@ -3057,6 +3066,7 @@ static void emitDelayedArguments(SILGenFunction &SGF,
30573066

30583067
if (defaultArgIsolation && delayedArg.isDefaultArg()) {
30593068
isolatedArgs.push_back(std::make_tuple(delayedNext, argsIt, i));
3069+
++i;
30603070
if (++delayedNext == delayedArgs.end()) {
30613071
goto done;
30623072
} else {
@@ -3127,14 +3137,44 @@ static void emitDelayedArguments(SILGenFunction &SGF,
31273137
SGF.emitHopToTargetExecutor(loc, executor);
31283138
}
31293139

3130-
size_t argsEmitted = 0;
3140+
// The index saved in isolatedArgs is the index where we're
3141+
// supposed to fill in the argument in siteArgs. It should point
3142+
// to a single null element, which we will replace with zero or
3143+
// more actual argument values. This replacement can invalidate
3144+
// later indices, so we need to apply an adjustment as we go.
3145+
//
3146+
// That adjustment only applies within the right siteArgs and
3147+
// must be reset when we change siteArgs. Fortunately, emission
3148+
// is always left-to-right and never revisits a siteArgs.
3149+
size_t indexAdjustment = 0;
3150+
auto indexAdjustmentSite = args.begin();
3151+
31313152
for (auto &isolatedArg : isolatedArgs) {
31323153
auto &delayedArg = *std::get<0>(isolatedArg);
3133-
auto &siteArgs = *std::get<1>(isolatedArg);
3134-
auto argIndex = std::get<2>(isolatedArg) + argsEmitted;
3135-
auto origIndex = argIndex;
3154+
auto site = std::get<1>(isolatedArg);
3155+
auto &siteArgs = *site;
3156+
size_t argIndex = std::get<2>(isolatedArg);
3157+
3158+
// Apply the current index adjustment if we haven't changed
3159+
// sites.
3160+
if (indexAdjustmentSite == site) {
3161+
argIndex += indexAdjustment;
3162+
3163+
// Otherwise, reset the current index adjustment.
3164+
} else {
3165+
indexAdjustment = 0;
3166+
}
3167+
3168+
assert(!siteArgs[argIndex] &&
3169+
"overwriting an existing arg during delayed isolated "
3170+
"argument emission");
3171+
3172+
size_t origIndex = argIndex;
31363173
delayedArg.emit(SGF, siteArgs, argIndex);
3137-
argsEmitted += (argIndex - origIndex);
3174+
3175+
// Accumulate the adjustment. Note that the adjustment can
3176+
// be negative, and we end up relying on modular unsigned math.
3177+
indexAdjustment += (argIndex - origIndex - 1);
31383178
}
31393179
}
31403180

‎test/SILGen/isolated_default_arguments.swift

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
// RUN: %target-swift-emit-silgen -Xllvm -sil-print-types -module-name test -Xllvm -sil-full-demangle -swift-version 6 %s | %FileCheck %s
2+
3+
// We weren't adjusting offsets around isolated default arguments
4+
// properly, and it broke when presented with a non-isolated or
5+
// non-defaulted argument between two isolated default arguments.
6+
7+
@MainActor
8+
func main_actor_int_x() -> Int {
9+
return 0
10+
}
11+
12+
@MainActor
13+
func main_actor_int_y() -> Int {
14+
return 0
15+
}
16+
17+
@MainActor
18+
func main_actor_int_z() -> Int {
19+
return 0
20+
}
21+
22+
@MainActor
23+
func main_actor_void() -> () {
24+
}
25+
26+
@MainActor
27+
func main_actor_int_pair() -> (Int, Int) {
28+
return (0,0)
29+
}
30+
31+
// This test breaks because the intermediate argument is `nil`, which
32+
// we treat as non-isolated.
33+
@MainActor
34+
func nonIsolatedDefaultArg(x: Int = main_actor_int_x(),
35+
y: Int? = nil,
36+
z: Int = main_actor_int_z()) {}
37+
38+
// CHECK-LABEL: sil hidden [ossa] @$s4test0A21NonIsolatedDefaultArgyyYaF :
39+
// CHECK: [[ARG1:%.*]] = enum $Optional<Int>, #Optional.none
40+
// CHECK: hop_to_executor {{%.*}} : $MainActor
41+
// CHECK-NEXT: // function_ref default argument 0 of
42+
// CHECK-NEXT: [[ARG0FN:%.*]] = function_ref @$s4test21nonIsolatedDefaultArg1x1y1zySi_SiSgSitFfA_
43+
// CHECK-NEXT: [[ARG0:%.*]] = apply [[ARG0FN]]()
44+
// CHECK-NEXT: // function_ref default argument 2 of
45+
// CHECK-NEXT: [[ARG2FN:%.*]] = function_ref @$s4test21nonIsolatedDefaultArg1x1y1zySi_SiSgSitFfA1_
46+
// CHECK-NEXT: [[ARG2:%.*]] = apply [[ARG2FN]]()
47+
// CHECK-NEXT: // function_ref test.nonIsolatedDefaultArg
48+
// CHECK-NEXT: [[FN:%.*]] = function_ref @$s4test21nonIsolatedDefaultArg1x1y1zySi_SiSgSitF :
49+
// CHECK: apply [[FN]]([[ARG0]], [[ARG1]], [[ARG2]])
50+
func testNonIsolatedDefaultArg() async {
51+
await nonIsolatedDefaultArg()
52+
}
53+
54+
// This test breaks because the intermediate argument is non-defaulted
55+
// and so gets evaluated in the non-delayed argument pass.
56+
@MainActor
57+
func isolatedDefaultArgs(x: Int = main_actor_int_x(),
58+
y: Int = main_actor_int_y(),
59+
z: Int = main_actor_int_z()) {}
60+
61+
// CHECK-LABEL: sil hidden [ossa] @$s4test0A13NonDefaultArgyyYaF :
62+
// CHECK: [[LITERAL_FN:%.*]] = function_ref @$sSi22_builtinIntegerLiteralSiBI_tcfC :
63+
// CHECK-NEXT: [[ARG1:%.*]] = apply [[LITERAL_FN]](
64+
// CHECK: hop_to_executor {{%.*}} : $MainActor
65+
// CHECK-NEXT: // function_ref default argument 0 of
66+
// CHECK-NEXT: [[ARG0FN:%.*]] = function_ref @$s4test19isolatedDefaultArgs1x1y1zySi_S2itFfA_
67+
// CHECK-NEXT: [[ARG0:%.*]] = apply [[ARG0FN]]()
68+
// CHECK-NEXT: // function_ref default argument 2 of
69+
// CHECK-NEXT: [[ARG2FN:%.*]] = function_ref @$s4test19isolatedDefaultArgs1x1y1zySi_S2itFfA1_
70+
// CHECK-NEXT: [[ARG2:%.*]] = apply [[ARG2FN]]()
71+
// CHECK-NEXT: // function_ref test.isolatedDefaultArgs
72+
// CHECK-NEXT: [[FN:%.*]] = function_ref @$s4test19isolatedDefaultArgs1x1y1zySi_S2itF :
73+
// CHECK: apply [[FN]]([[ARG0]], [[ARG1]], [[ARG2]])
74+
func testNonDefaultArg() async {
75+
await isolatedDefaultArgs(y: 0)
76+
}
77+
78+
// Exercise our handling of isolated default arguments that expand to
79+
// empty or multiple arguments.
80+
@MainActor
81+
func voidIsolatedDefaultArg(x: () = main_actor_void(),
82+
y: Int = main_actor_int_y(),
83+
z: Int = main_actor_int_z()) {}
84+
85+
// CHECK-LABEL: sil hidden [ossa] @$s4test0A22VoidIsolatedDefaultArgyyYaF :
86+
// CHECK: [[LITERAL_FN:%.*]] = function_ref @$sSi22_builtinIntegerLiteralSiBI_tcfC :
87+
// CHECK-NEXT: [[ARG1:%.*]] = apply [[LITERAL_FN]](
88+
// CHECK: hop_to_executor {{%.*}} : $MainActor
89+
// CHECK-NEXT: // function_ref default argument 0 of
90+
// CHECK-NEXT: [[ARG0FN:%.*]] = function_ref @$s4test22voidIsolatedDefaultArg1x1y1zyyt_S2itFfA_
91+
// CHECK-NEXT: [[ARG0:%.*]] = apply [[ARG0FN]]()
92+
// CHECK-NEXT: // function_ref default argument 2 of
93+
// CHECK-NEXT: [[ARG2FN:%.*]] = function_ref @$s4test22voidIsolatedDefaultArg1x1y1zyyt_S2itFfA1_
94+
// CHECK-NEXT: [[ARG2:%.*]] = apply [[ARG2FN]]()
95+
// CHECK-NEXT: // function_ref test.voidIsolatedDefaultArg
96+
// CHECK-NEXT: [[FN:%.*]] = function_ref @$s4test22voidIsolatedDefaultArg1x1y1zyyt_S2itF :
97+
// CHECK: apply [[FN]]([[ARG1]], [[ARG2]])
98+
func testVoidIsolatedDefaultArg() async {
99+
await voidIsolatedDefaultArg(y: 0)
100+
}
101+
102+
@MainActor
103+
func tupleIsolatedDefaultArg(x: (Int,Int) = main_actor_int_pair(),
104+
y: Int = main_actor_int_y(),
105+
z: Int = main_actor_int_z()) {}
106+
107+
// CHECK-LABEL: sil hidden [ossa] @$s4test0A23TupleIsolatedDefaultArgyyYaF :
108+
// CHECK: [[LITERAL_FN:%.*]] = function_ref @$sSi22_builtinIntegerLiteralSiBI_tcfC :
109+
// CHECK-NEXT: [[ARG1:%.*]] = apply [[LITERAL_FN]](
110+
// CHECK: hop_to_executor {{%.*}} : $MainActor
111+
// CHECK-NEXT: // function_ref default argument 0 of
112+
// CHECK-NEXT: [[ARG0FN:%.*]] = function_ref @$s4test23tupleIsolatedDefaultArg1x1y1zySi_Sit_S2itFfA_
113+
// CHECK-NEXT: [[ARG0:%.*]] = apply [[ARG0FN]]()
114+
// CHECK-NEXT: ([[ARG0_0:%.*]], [[ARG0_1:%.*]]) = destructure_tuple [[ARG0]] : $(Int, Int)
115+
// CHECK-NEXT: // function_ref default argument 2 of
116+
// CHECK-NEXT: [[ARG2FN:%.*]] = function_ref @$s4test23tupleIsolatedDefaultArg1x1y1zySi_Sit_S2itFfA1_
117+
// CHECK-NEXT: [[ARG2:%.*]] = apply [[ARG2FN]]()
118+
// CHECK-NEXT: // function_ref test.tupleIsolatedDefaultArg
119+
// CHECK-NEXT: [[FN:%.*]] = function_ref @$s4test23tupleIsolatedDefaultArg1x1y1zySi_Sit_S2itF :
120+
// CHECK: apply [[FN]]([[ARG0_0]], [[ARG0_1]], [[ARG1]], [[ARG2]])
121+
func testTupleIsolatedDefaultArg() async {
122+
await tupleIsolatedDefaultArg(y: 0)
123+
}

0 commit comments

Comments
 (0)