From 0839a72e2c28631005b0274e833a57059fb25b9b Mon Sep 17 00:00:00 2001 From: Junliang Yan Date: Tue, 10 Nov 2020 16:04:41 -0500 Subject: [PATCH] PPC/s390: fix ptr-compr error Change-Id: I275b15d2b37a4043c3cdb8815fab5e93c1b5e728 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2530214 Reviewed-by: Milad Fa Commit-Queue: Junliang Yan Cr-Commit-Position: refs/heads/master@{#71097} --- src/builtins/ppc/builtins-ppc.cc | 3 ++- src/builtins/s390/builtins-s390.cc | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/builtins/ppc/builtins-ppc.cc b/src/builtins/ppc/builtins-ppc.cc index efd65e2971..b7e914f163 100644 --- a/src/builtins/ppc/builtins-ppc.cc +++ b/src/builtins/ppc/builtins-ppc.cc @@ -464,7 +464,8 @@ void Builtins::Generate_ResumeGeneratorTrampoline(MacroAssembler* masm) { // Resume (Ignition/TurboFan) generator object. { - __ LoadP(r3, FieldMemOperand(r7, JSFunction::kSharedFunctionInfoOffset)); + __ LoadTaggedPointerField( + r3, FieldMemOperand(r7, JSFunction::kSharedFunctionInfoOffset)); __ LoadHalfWord( r3, FieldMemOperand(r3, SharedFunctionInfo::kFormalParameterCountOffset)); diff --git a/src/builtins/s390/builtins-s390.cc b/src/builtins/s390/builtins-s390.cc index 8cc3a949c3..13231be060 100644 --- a/src/builtins/s390/builtins-s390.cc +++ b/src/builtins/s390/builtins-s390.cc @@ -456,7 +456,8 @@ void Builtins::Generate_ResumeGeneratorTrampoline(MacroAssembler* masm) { // Resume (Ignition/TurboFan) generator object. { - __ LoadP(r2, FieldMemOperand(r6, JSFunction::kSharedFunctionInfoOffset)); + __ LoadTaggedPointerField( + r2, FieldMemOperand(r6, JSFunction::kSharedFunctionInfoOffset)); __ LoadHalfWordP( r2, FieldMemOperand(r2, SharedFunctionInfo::kFormalParameterCountOffset));