AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[maglev] Ensure CheckedObjectToIndex zero extends

Browse Source 
Use SmiToInt32 instead of SmiUntag to get a zero extended value in
CheckedObjectToIndex.

Bug: v8:7700
Change-Id: I034039781d8db106713e54ebaf72672c261b8fc1
Fixed: chromium:1406573
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4161759
Commit-Queue: Victor Gomes <victorgomes@chromium.org>
Auto-Submit: Leszek Swirski <leszeks@chromium.org>
Reviewed-by: Victor Gomes <victorgomes@chromium.org>
Cr-Commit-Position: refs/heads/main@{#85252}
This commit is contained in:
Leszek Swirski 2023-01-12 13:28:05 +01:00 committed by V8 LUCI CQ
parent 2501a75575
commit d8cd42360d
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/codegen/x64/macro-assembler-x64.cc
View File

@ -1580,6 +1580,12 @@ void TurboAssembler::SmiToInt32(Register reg) {
}
}
void TurboAssembler::SmiToInt32(Register dst, Register src) {
DCHECK(dst != src);
mov_tagged(dst, src);
SmiToInt32(dst);
}
void TurboAssembler::SmiCompare(Register smi1, Register smi2) {
AssertSmi(smi1);
AssertSmi(smi2);

1
src/codegen/x64/macro-assembler-x64.h
View File

@ -367,6 +367,7 @@ class V8_EXPORT_PRIVATE TurboAssembler
// Convert smi to 32-bit value.
void SmiToInt32(Register reg);
void SmiToInt32(Register dst, Register src);
// Loads the address of the external reference into the destination
// register.

4
src/maglev/arm64/maglev-ir-arm64.cc
View File

@ -790,9 +790,9 @@ void CheckedObjectToIndex::GenerateCode(MaglevAssembler* masm,
// If we didn't enter the deferred block, we're a Smi.
if (result_reg == object) {
__ SmiUntag(object);
__ SmiToInt32(result_reg);
} else {
__ SmiUntag(result_reg, object);
__ SmiToInt32(result_reg, object);
}
__ bind(*done);

4
src/maglev/x64/maglev-ir-x64.cc
View File

@ -714,9 +714,9 @@ void CheckedObjectToIndex::GenerateCode(MaglevAssembler* masm,
// If we didn't enter the deferred block, we're a Smi.
if (result_reg == object) {
__ SmiUntag(object);
__ SmiToInt32(result_reg);
} else {
__ SmiUntag(result_reg, object);
__ SmiToInt32(result_reg, object);
}
__ bind(*done);