From 05a3ad7c72922d7c150b3a897220cf9c2c36ecfb Mon Sep 17 00:00:00 2001 From: Jakob Linke Date: Mon, 23 Jan 2023 07:36:54 +0000 Subject: [PATCH] Revert "[maglev] Load SFI::length as int16" This reverts commit d236b0ebb75bfb651c91bf140d8415d4d4daf9ec. Reason for revert: Reverting the CL that introduced the bug, see crbug.com/1408957 Original change's description: > [maglev] Load SFI::length as int16 > > Bug: v8:7700 > Change-Id: I853ef2c81d180a98a0c97322832f4b35789baeb2 > Fixed: chromium:1408956 > Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4183487 > Auto-Submit: Leszek Swirski > Reviewed-by: Victor Gomes > Commit-Queue: Victor Gomes > Cr-Commit-Position: refs/heads/main@{#85418} Bug: v8:7700 Bug: chromium:1408957 Change-Id: I2f5b163505e437232121c8a142cd03d16f228381 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4187095 Commit-Queue: Jakob Linke Bot-Commit: Rubber Stamper Cr-Commit-Position: refs/heads/main@{#85427} --- src/maglev/arm64/maglev-ir-arm64.cc | 5 ++--- src/maglev/maglev-compiler.cc | 1 - src/maglev/x64/maglev-ir-x64.cc | 5 ++--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/maglev/arm64/maglev-ir-arm64.cc b/src/maglev/arm64/maglev-ir-arm64.cc index 7a8c31e365..7b1629e84e 100644 --- a/src/maglev/arm64/maglev-ir-arm64.cc +++ b/src/maglev/arm64/maglev-ir-arm64.cc @@ -2493,9 +2493,8 @@ void FunctionLength::GenerateCode(MaglevAssembler* masm, Register shared = temps.AcquireX(); __ LoadTaggedPointerField( shared, FieldMemOperand(object, JSFunction::kSharedFunctionInfoOffset)); - __ LoadSignedField(ToRegister(result()).W(), - FieldMemOperand(shared, SharedFunctionInfo::kLengthOffset), - 2); + __ Ldr(ToRegister(result()).W(), + FieldMemOperand(shared, SharedFunctionInfo::kLengthOffset)); } void TestUndetectable::SetValueLocationConstraints() { diff --git a/src/maglev/maglev-compiler.cc b/src/maglev/maglev-compiler.cc index 7cb4a3a822..4b25667563 100644 --- a/src/maglev/maglev-compiler.cc +++ b/src/maglev/maglev-compiler.cc @@ -451,7 +451,6 @@ MaybeHandle MaglevCompiler::GenerateCode( if (v8_flags.print_maglev_code) { code->Print(); - code->instruction_stream().Print(); } return code; diff --git a/src/maglev/x64/maglev-ir-x64.cc b/src/maglev/x64/maglev-ir-x64.cc index 72a465a0eb..955dfd690f 100644 --- a/src/maglev/x64/maglev-ir-x64.cc +++ b/src/maglev/x64/maglev-ir-x64.cc @@ -1342,9 +1342,8 @@ void FunctionLength::GenerateCode(MaglevAssembler* masm, __ LoadTaggedPointerField( kScratchRegister, FieldOperand(object, JSFunction::kSharedFunctionInfoOffset)); - __ LoadSignedField( - ToRegister(result()), - FieldMemOperand(kScratchRegister, SharedFunctionInfo::kLengthOffset), 2); + __ movl(ToRegister(result()), + FieldOperand(kScratchRegister, SharedFunctionInfo::kLengthOffset)); } void Int32AddWithOverflow::SetValueLocationConstraints() {