Skip to content

Commit 7865718

Browse files
ShaharNavehShaharNaveh
committed
Fix more
1 parent f9e5530 commit 7865718

1 file changed

Lines changed: 68 additions & 34 deletions

File tree

‎crates/vm/src/frame.rs‎

Lines changed: 68 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2655,7 +2655,7 @@ impl ExecutingFrame<'_> {
26552655
.write_cache_u16(cache_base, counter - 1);
26562656
}
26572657
} else {
2658-
self.specialize_store_attr(vm, idx.get(arg), instr_idx, cache_base);
2658+
self.specialize_store_attr(vm, namei.get(arg), instr_idx, cache_base);
26592659
}
26602660
self.store_attr(vm, namei.get(arg))
26612661
}
@@ -2903,7 +2903,7 @@ impl ExecutingFrame<'_> {
29032903
self.code.instructions.replace_op(
29042904
instr_idx,
29052905
Instruction::Send {
2906-
target: Arg::marker(),
2906+
delta: Arg::marker(),
29072907
},
29082908
);
29092909
self.code
@@ -3154,9 +3154,12 @@ impl ExecutingFrame<'_> {
31543154
}
31553155
// Deoptimize
31563156
unsafe {
3157-
self.code
3158-
.instructions
3159-
.replace_op(instr_idx, Instruction::LoadAttr { idx: Arg::marker() });
3157+
self.code.instructions.replace_op(
3158+
instr_idx,
3159+
Instruction::LoadAttr {
3160+
namei: Arg::marker(),
3161+
},
3162+
);
31603163
self.code
31613164
.instructions
31623165
.write_adaptive_counter(cache_base, ADAPTIVE_BACKOFF_VALUE);
@@ -3185,9 +3188,12 @@ impl ExecutingFrame<'_> {
31853188
return Ok(None);
31863189
}
31873190
unsafe {
3188-
self.code
3189-
.instructions
3190-
.replace_op(instr_idx, Instruction::LoadAttr { idx: Arg::marker() });
3191+
self.code.instructions.replace_op(
3192+
instr_idx,
3193+
Instruction::LoadAttr {
3194+
namei: Arg::marker(),
3195+
},
3196+
);
31913197
self.code
31923198
.instructions
31933199
.write_adaptive_counter(cache_base, ADAPTIVE_BACKOFF_VALUE);
@@ -3230,9 +3236,12 @@ impl ExecutingFrame<'_> {
32303236
return Ok(None);
32313237
}
32323238
unsafe {
3233-
self.code
3234-
.instructions
3235-
.replace_op(instr_idx, Instruction::LoadAttr { idx: Arg::marker() });
3239+
self.code.instructions.replace_op(
3240+
instr_idx,
3241+
Instruction::LoadAttr {
3242+
namei: Arg::marker(),
3243+
},
3244+
);
32363245
self.code
32373246
.instructions
32383247
.write_adaptive_counter(cache_base, ADAPTIVE_BACKOFF_VALUE);
@@ -3263,9 +3272,12 @@ impl ExecutingFrame<'_> {
32633272
return Ok(None);
32643273
}
32653274
unsafe {
3266-
self.code
3267-
.instructions
3268-
.replace_op(instr_idx, Instruction::LoadAttr { idx: Arg::marker() });
3275+
self.code.instructions.replace_op(
3276+
instr_idx,
3277+
Instruction::LoadAttr {
3278+
namei: Arg::marker(),
3279+
},
3280+
);
32693281
self.code
32703282
.instructions
32713283
.write_adaptive_counter(cache_base, ADAPTIVE_BACKOFF_VALUE);
@@ -3296,9 +3308,12 @@ impl ExecutingFrame<'_> {
32963308
// Slot is None → AttributeError (fall through to slow path)
32973309
}
32983310
unsafe {
3299-
self.code
3300-
.instructions
3301-
.replace_op(instr_idx, Instruction::LoadAttr { idx: Arg::marker() });
3311+
self.code.instructions.replace_op(
3312+
instr_idx,
3313+
Instruction::LoadAttr {
3314+
namei: Arg::marker(),
3315+
},
3316+
);
33023317
self.code
33033318
.instructions
33043319
.write_adaptive_counter(cache_base, ADAPTIVE_BACKOFF_VALUE);
@@ -3328,9 +3343,12 @@ impl ExecutingFrame<'_> {
33283343
}
33293344
}
33303345
unsafe {
3331-
self.code
3332-
.instructions
3333-
.replace_op(instr_idx, Instruction::LoadAttr { idx: Arg::marker() });
3346+
self.code.instructions.replace_op(
3347+
instr_idx,
3348+
Instruction::LoadAttr {
3349+
namei: Arg::marker(),
3350+
},
3351+
);
33343352
self.code
33353353
.instructions
33363354
.write_adaptive_counter(cache_base, ADAPTIVE_BACKOFF_VALUE);
@@ -3356,9 +3374,12 @@ impl ExecutingFrame<'_> {
33563374
}
33573375
// Deoptimize
33583376
unsafe {
3359-
self.code
3360-
.instructions
3361-
.replace_op(instr_idx, Instruction::StoreAttr { idx: Arg::marker() });
3377+
self.code.instructions.replace_op(
3378+
instr_idx,
3379+
Instruction::StoreAttr {
3380+
namei: Arg::marker(),
3381+
},
3382+
);
33623383
self.code
33633384
.instructions
33643385
.write_adaptive_counter(cache_base, ADAPTIVE_BACKOFF_VALUE);
@@ -3385,9 +3406,12 @@ impl ExecutingFrame<'_> {
33853406
// Deoptimize
33863407
let attr_idx = u32::from(arg);
33873408
unsafe {
3388-
self.code
3389-
.instructions
3390-
.replace_op(instr_idx, Instruction::StoreAttr { idx: Arg::marker() });
3409+
self.code.instructions.replace_op(
3410+
instr_idx,
3411+
Instruction::StoreAttr {
3412+
namei: Arg::marker(),
3413+
},
3414+
);
33913415
self.code
33923416
.instructions
33933417
.write_adaptive_counter(cache_base, ADAPTIVE_BACKOFF_VALUE);
@@ -4344,7 +4368,9 @@ impl ExecutingFrame<'_> {
43444368
unsafe {
43454369
self.code.instructions.replace_op(
43464370
self.lasti() as usize - 1,
4347-
Instruction::LoadSuperAttr { arg: Arg::marker() },
4371+
Instruction::LoadSuperAttr {
4372+
namei: Arg::marker(),
4373+
},
43484374
);
43494375
let cache_base = self.lasti() as usize;
43504376
self.code
@@ -4422,7 +4448,9 @@ impl ExecutingFrame<'_> {
44224448
unsafe {
44234449
self.code.instructions.replace_op(
44244450
self.lasti() as usize - 1,
4425-
Instruction::LoadSuperAttr { arg: Arg::marker() },
4451+
Instruction::LoadSuperAttr {
4452+
namei: Arg::marker(),
4453+
},
44264454
);
44274455
let cache_base = self.lasti() as usize;
44284456
self.code
@@ -7021,9 +7049,12 @@ impl ExecutingFrame<'_> {
70217049
let instr_idx = self.lasti() as usize - 1;
70227050
let cache_base = instr_idx + 1;
70237051
unsafe {
7024-
self.code
7025-
.instructions
7026-
.replace_op(instr_idx, Instruction::CompareOp { op: Arg::marker() });
7052+
self.code.instructions.replace_op(
7053+
instr_idx,
7054+
Instruction::CompareOp {
7055+
opname: Arg::marker(),
7056+
},
7057+
);
70277058
self.code
70287059
.instructions
70297060
.write_adaptive_counter(cache_base, ADAPTIVE_BACKOFF_VALUE);
@@ -7221,9 +7252,12 @@ impl ExecutingFrame<'_> {
72217252
let instr_idx = self.lasti() as usize - 1;
72227253
let cache_base = instr_idx + 1;
72237254
unsafe {
7224-
self.code
7225-
.instructions
7226-
.replace_op(instr_idx, Instruction::LoadGlobal(Arg::marker()));
7255+
self.code.instructions.replace_op(
7256+
instr_idx,
7257+
Instruction::LoadGlobal {
7258+
namei: Arg::marker(),
7259+
},
7260+
);
72277261
self.code
72287262
.instructions
72297263
.write_adaptive_counter(cache_base, ADAPTIVE_BACKOFF_VALUE);

0 commit comments

Comments
 (0)