| Index: src/arm/stub-cache-arm.cc
|
| diff --git a/src/arm/stub-cache-arm.cc b/src/arm/stub-cache-arm.cc
|
| index 14aa898ab130c1e749a27241051cf7785b0ba03b..dc9a185eee2ca89783435e84f6664d48fbc8efd6 100644
|
| --- a/src/arm/stub-cache-arm.cc
|
| +++ b/src/arm/stub-cache-arm.cc
|
| @@ -1309,9 +1309,19 @@ void BaseLoadStubCompiler::NonexistentHandlerFrontend(
|
|
|
| void BaseLoadStubCompiler::GenerateLoadField(Register reg,
|
| Handle<JSObject> holder,
|
| - PropertyIndex index) {
|
| - GenerateFastPropertyLoad(masm(), r0, reg, holder, index);
|
| - __ Ret();
|
| + PropertyIndex field) {
|
| + if (!reg.is(receiver())) __ mov(receiver(), reg);
|
| + if (kind() == Code::LOAD_IC) {
|
| + LoadFieldStub stub(field.is_inobject(holder),
|
| + field.translate(holder),
|
| + Representation::Tagged());
|
| + GenerateTailCall(masm(), stub.GetCode(isolate()));
|
| + } else {
|
| + KeyedLoadFieldStub stub(field.is_inobject(holder),
|
| + field.translate(holder),
|
| + Representation::Tagged());
|
| + GenerateTailCall(masm(), stub.GetCode(isolate()));
|
| + }
|
| }
|
|
|
|
|
|
|