Skip to content

Commit 0b94a9f

Browse files
isheludkoV8 LUCI CQ
authored andcommitted
[leaptiering] Fix BaselineOutOfLinePrologue builtin
... which tried to preserve kJavaScriptCallDispatchHandleRegister even on configurations where it's not used which resulted in a random value on the stack discoverable by GC. This issue triggered only on non-sandbox configuration with enabled leaptiering. Drive-by: fix MacroAssembler::GenerateTailCallToReturnedCode() on riscv port which wasn't preserving dispatch handle as all the other ports do. Bug: 42204201 Fixed: 413769394 Change-Id: If146b0b7a6cf972ed5a881142f40980774f19cba Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/6587010 Commit-Queue: Igor Sheludko <[email protected]> Reviewed-by: Olivier Flückiger <[email protected]> Cr-Commit-Position: refs/heads/main@{#100512}
1 parent 61fc93c commit 0b94a9f

10 files changed

Lines changed: 46 additions & 23 deletions

File tree

‎src/builtins/arm64/builtins-arm64.cc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1298,11 +1298,12 @@ void Builtins::Generate_BaselineOutOfLinePrologue(MacroAssembler* masm) {
12981298

12991299
FrameScope frame_scope(masm, StackFrame::INTERNAL);
13001300
// Save incoming new target or generator
1301-
Register maybe_dispatch_handle = V8_ENABLE_LEAPTIERING_BOOL
1301+
Register maybe_dispatch_handle = V8_JS_LINKAGE_INCLUDES_DISPATCH_HANDLE_BOOL
13021302
? kJavaScriptCallDispatchHandleRegister
13031303
: padreg;
13041304
// No need to SmiTag as dispatch handles always look like Smis.
13051305
static_assert(kJSDispatchHandleShift > 0);
1306+
__ AssertSmi(maybe_dispatch_handle);
13061307
__ Push(maybe_dispatch_handle, new_target);
13071308
__ SmiTag(frame_size);
13081309
__ PushArgument(frame_size);

‎src/builtins/loong64/builtins-loong64.cc‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1103,15 +1103,16 @@ void Builtins::Generate_BaselineOutOfLinePrologue(MacroAssembler* masm) {
11031103
FrameScope frame_scope(masm, StackFrame::INTERNAL);
11041104
// Save incoming new target or generator
11051105
__ Push(kJavaScriptCallNewTargetRegister);
1106-
#ifdef V8_ENABLE_LEAPTIERING
1106+
#ifdef V8_JS_LINKAGE_INCLUDES_DISPATCH_HANDLE
11071107
// No need to SmiTag as dispatch handles always look like Smis.
11081108
static_assert(kJSDispatchHandleShift > 0);
1109+
__ AssertSmi(kJavaScriptCallDispatchHandleRegister);
11091110
__ Push(kJavaScriptCallDispatchHandleRegister);
11101111
#endif
11111112
__ SmiTag(frame_size);
11121113
__ Push(frame_size);
11131114
__ CallRuntime(Runtime::kStackGuardWithGap);
1114-
#ifdef V8_ENABLE_LEAPTIERING
1115+
#ifdef V8_JS_LINKAGE_INCLUDES_DISPATCH_HANDLE
11151116
__ Pop(kJavaScriptCallDispatchHandleRegister);
11161117
#endif
11171118
__ Pop(kJavaScriptCallNewTargetRegister);

‎src/builtins/mips64/builtins-mips64.cc‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,15 +1065,16 @@ void Builtins::Generate_BaselineOutOfLinePrologue(MacroAssembler* masm) {
10651065
FrameScope frame_scope(masm, StackFrame::INTERNAL);
10661066
// Save incoming new target or generator
10671067
__ Push(kJavaScriptCallNewTargetRegister);
1068-
#ifdef V8_ENABLE_LEAPTIERING
1068+
#ifdef V8_JS_LINKAGE_INCLUDES_DISPATCH_HANDLE
10691069
// No need to SmiTag as dispatch handles always look like Smis.
10701070
static_assert(kJSDispatchHandleShift > 0);
1071+
__ AssertSmi(kJavaScriptCallDispatchHandleRegister);
10711072
__ Push(kJavaScriptCallDispatchHandleRegister);
10721073
#endif
10731074
__ SmiTag(frame_size);
10741075
__ Push(frame_size);
10751076
__ CallRuntime(Runtime::kStackGuardWithGap);
1076-
#ifdef V8_ENABLE_LEAPTIERING
1077+
#ifdef V8_JS_LINKAGE_INCLUDES_DISPATCH_HANDLE
10771078
__ Pop(kJavaScriptCallDispatchHandleRegister);
10781079
#endif
10791080
__ Pop(kJavaScriptCallNewTargetRegister);

‎src/builtins/riscv/builtins-riscv.cc‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1099,15 +1099,18 @@ void Builtins::Generate_BaselineOutOfLinePrologue(MacroAssembler* masm) {
10991099
FrameScope frame_scope(masm, StackFrame::INTERNAL);
11001100
// Save incoming new target or generator
11011101
__ Push(kJavaScriptCallNewTargetRegister);
1102-
#if defined(V8_ENABLE_LEAPTIERING) && defined(V8_TARGET_ARCH_RISCV64)
1102+
#if defined(V8_JS_LINKAGE_INCLUDES_DISPATCH_HANDLE) && \
1103+
defined(V8_TARGET_ARCH_RISCV64)
11031104
// No need to SmiTag as dispatch handles always look like Smis.
11041105
static_assert(kJSDispatchHandleShift > 0);
1106+
__ AssertSmi(kJavaScriptCallDispatchHandleRegister);
11051107
__ Push(kJavaScriptCallDispatchHandleRegister);
11061108
#endif
11071109
__ SmiTag(frame_size);
11081110
__ Push(frame_size);
11091111
__ CallRuntime(Runtime::kStackGuardWithGap);
1110-
#if defined(V8_ENABLE_LEAPTIERING) && defined(V8_TARGET_ARCH_RISCV64)
1112+
#if defined(V8_JS_LINKAGE_INCLUDES_DISPATCH_HANDLE) && \
1113+
defined(V8_TARGET_ARCH_RISCV64)
11111114
__ Pop(kJavaScriptCallDispatchHandleRegister);
11121115
#endif
11131116
__ Pop(kJavaScriptCallNewTargetRegister);

‎src/builtins/x64/builtins-x64.cc‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2023,15 +2023,16 @@ void Builtins::Generate_BaselineOutOfLinePrologue(MacroAssembler* masm) {
20232023
FrameScope inner_frame_scope(masm, StackFrame::INTERNAL);
20242024
// Save incoming new target or generator
20252025
__ Push(new_target);
2026-
#ifdef V8_ENABLE_LEAPTIERING
2026+
#ifdef V8_JS_LINKAGE_INCLUDES_DISPATCH_HANDLE
20272027
// No need to SmiTag as dispatch handles always look like Smis.
20282028
static_assert(kJSDispatchHandleShift > 0);
2029+
__ AssertSmi(kJavaScriptCallDispatchHandleRegister);
20292030
__ Push(kJavaScriptCallDispatchHandleRegister);
20302031
#endif
20312032
__ SmiTag(frame_size);
20322033
__ Push(frame_size);
20332034
__ CallRuntime(Runtime::kStackGuardWithGap, 1);
2034-
#ifdef V8_ENABLE_LEAPTIERING
2035+
#ifdef V8_JS_LINKAGE_INCLUDES_DISPATCH_HANDLE
20352036
__ Pop(kJavaScriptCallDispatchHandleRegister);
20362037
#endif
20372038
__ Pop(new_target);

‎src/codegen/arm64/macro-assembler-arm64.cc‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1525,14 +1525,15 @@ void MacroAssembler::GenerateTailCallToReturnedCode(
15251525
FrameScope scope(this, StackFrame::INTERNAL);
15261526
// Push a copy of the target function, the new target, the actual
15271527
// argument count, and the dispatch handle.
1528-
Register lastreg = V8_ENABLE_LEAPTIERING_BOOL
1529-
? kJavaScriptCallDispatchHandleRegister
1530-
: padreg;
1528+
Register maybe_dispatch_handle = V8_JS_LINKAGE_INCLUDES_DISPATCH_HANDLE_BOOL
1529+
? kJavaScriptCallDispatchHandleRegister
1530+
: padreg;
15311531
SmiTag(kJavaScriptCallArgCountRegister);
15321532
// No need to SmiTag the dispatch handle as it always looks like a Smi.
15331533
static_assert(kJSDispatchHandleShift > 0);
1534+
AssertSmi(maybe_dispatch_handle);
15341535
Push(kJavaScriptCallTargetRegister, kJavaScriptCallNewTargetRegister,
1535-
kJavaScriptCallArgCountRegister, lastreg);
1536+
kJavaScriptCallArgCountRegister, maybe_dispatch_handle);
15361537
// Push another copy as a parameter to the runtime call.
15371538
PushArgument(kJavaScriptCallTargetRegister);
15381539

@@ -1543,7 +1544,7 @@ void MacroAssembler::GenerateTailCallToReturnedCode(
15431544

15441545
// Restore target function, new target, actual argument count, and dispatch
15451546
// handle.
1546-
Pop(lastreg, kJavaScriptCallArgCountRegister,
1547+
Pop(maybe_dispatch_handle, kJavaScriptCallArgCountRegister,
15471548
kJavaScriptCallNewTargetRegister, kJavaScriptCallTargetRegister);
15481549
SmiUntag(kJavaScriptCallArgCountRegister);
15491550
}

‎src/codegen/loong64/macro-assembler-loong64.cc‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5111,9 +5111,10 @@ void MacroAssembler::GenerateTailCallToReturnedCode(
51115111
SmiTag(kJavaScriptCallArgCountRegister);
51125112
Push(kJavaScriptCallTargetRegister, kJavaScriptCallNewTargetRegister,
51135113
kJavaScriptCallArgCountRegister);
5114-
#ifdef V8_ENABLE_LEAPTIERING
5114+
#ifdef V8_JS_LINKAGE_INCLUDES_DISPATCH_HANDLE
51155115
// No need to SmiTag since dispatch handles always look like Smis.
51165116
static_assert(kJSDispatchHandleShift > 0);
5117+
AssertSmi(kJavaScriptCallDispatchHandleRegister);
51175118
Push(kJavaScriptCallDispatchHandleRegister);
51185119
#endif
51195120
// Function is also the parameter to the runtime call.
@@ -5124,7 +5125,7 @@ void MacroAssembler::GenerateTailCallToReturnedCode(
51245125

51255126
// Restore target function, new target, actual argument count and dispatch
51265127
// handle.
5127-
#ifdef V8_ENABLE_LEAPTIERING
5128+
#ifdef V8_JS_LINKAGE_INCLUDES_DISPATCH_HANDLE
51285129
Pop(kJavaScriptCallDispatchHandleRegister);
51295130
#endif
51305131
Pop(kJavaScriptCallTargetRegister, kJavaScriptCallNewTargetRegister,

‎src/codegen/mips64/macro-assembler-mips64.cc‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6579,16 +6579,17 @@ void MacroAssembler::GenerateTailCallToReturnedCode(
65796579
SmiTag(kJavaScriptCallArgCountRegister);
65806580
Push(kJavaScriptCallTargetRegister, kJavaScriptCallNewTargetRegister,
65816581
kJavaScriptCallArgCountRegister);
6582-
#ifdef V8_ENABLE_LEAPTIERING
6582+
#ifdef V8_JS_LINKAGE_INCLUDES_DISPATCH_HANDLE
65836583
// No need to SmiTag since dispatch handles always look like Smis.
65846584
static_assert(kJSDispatchHandleShift > 0);
6585+
AssertSmi(kJavaScriptCallDispatchHandleRegister);
65856586
Push(kJavaScriptCallDispatchHandleRegister);
65866587
#endif
65876588
// Function is also the parameter to the runtime call.
65886589
Push(kJavaScriptCallTargetRegister);
65896590
CallRuntime(function_id, 1);
65906591
// Restore target function, new target and actual argument count.
6591-
#ifdef V8_ENABLE_LEAPTIERING
6592+
#ifdef V8_JS_LINKAGE_INCLUDES_DISPATCH_HANDLE
65926593
Pop(kJavaScriptCallDispatchHandleRegister);
65936594
#endif
65946595
Pop(kJavaScriptCallTargetRegister, kJavaScriptCallNewTargetRegister,

‎src/codegen/riscv/macro-assembler-riscv.cc‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,22 +186,34 @@ void MacroAssembler::GenerateTailCallToReturnedCode(
186186
// -- a0 : actual argument count
187187
// -- a1 : target function (preserved for callee)
188188
// -- a3 : new target (preserved for callee)
189+
// -- a4 : dispatch handle (preserved for callee)
189190
// -----------------------------------
190191
{
191192
FrameScope scope(this, StackFrame::INTERNAL);
192-
// Push a copy of the target function, the new target and the actual
193-
// argument count.
193+
// Push a copy of the target function, the new target, the actual
194+
// argument count, and the dispatch handle.
194195
// Push function as parameter to the runtime call.
195196
SmiTag(kJavaScriptCallArgCountRegister);
197+
#if defined(V8_JS_LINKAGE_INCLUDES_DISPATCH_HANDLE) && \
198+
defined(V8_TARGET_ARCH_RISCV64)
199+
// No need to SmiTag as dispatch handles always look like Smis.
200+
static_assert(kJSDispatchHandleShift > 0);
201+
AssertSmi(kJavaScriptCallDispatchHandleRegister);
202+
Push(kJavaScriptCallDispatchHandleRegister);
203+
#endif
196204
Push(kJavaScriptCallTargetRegister, kJavaScriptCallNewTargetRegister,
197-
kJavaScriptCallArgCountRegister, kJavaScriptCallTargetRegister);
205+
kJavaScriptCallArgCountRegister);
198206

199207
CallRuntime(function_id, 1);
200208
// Use the return value before restoring a0
201209
LoadCodeInstructionStart(a2, a0, kJSEntrypointTag);
202210
// Restore target function, new target and actual argument count.
203211
Pop(kJavaScriptCallTargetRegister, kJavaScriptCallNewTargetRegister,
204212
kJavaScriptCallArgCountRegister);
213+
#if defined(V8_JS_LINKAGE_INCLUDES_DISPATCH_HANDLE) && \
214+
defined(V8_TARGET_ARCH_RISCV64)
215+
Pop(kJavaScriptCallDispatchHandleRegister);
216+
#endif
205217
SmiUntag(kJavaScriptCallArgCountRegister);
206218
}
207219

‎src/codegen/x64/macro-assembler-x64.cc‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1255,9 +1255,10 @@ void MacroAssembler::GenerateTailCallToReturnedCode(
12551255
Push(kJavaScriptCallNewTargetRegister);
12561256
SmiTag(kJavaScriptCallArgCountRegister);
12571257
Push(kJavaScriptCallArgCountRegister);
1258-
#ifdef V8_ENABLE_LEAPTIERING
1258+
#ifdef V8_JS_LINKAGE_INCLUDES_DISPATCH_HANDLE
12591259
// No need to SmiTag since dispatch handles always look like Smis.
12601260
static_assert(kJSDispatchHandleShift > 0);
1261+
AssertSmi(kJavaScriptCallDispatchHandleRegister);
12611262
Push(kJavaScriptCallDispatchHandleRegister);
12621263
#endif
12631264
// Function is also the parameter to the runtime call.
@@ -1270,7 +1271,7 @@ void MacroAssembler::GenerateTailCallToReturnedCode(
12701271

12711272
// Restore target function, new target, actual argument count, and dispatch
12721273
// handle.
1273-
#ifdef V8_ENABLE_LEAPTIERING
1274+
#ifdef V8_JS_LINKAGE_INCLUDES_DISPATCH_HANDLE
12741275
Pop(kJavaScriptCallDispatchHandleRegister);
12751276
#endif
12761277
Pop(kJavaScriptCallArgCountRegister);

0 commit comments

Comments
 (0)