[vm/compiler] Move runtime call of InitInstanceField out into a Stub
If the runtime causes a deoptimization of the frame it expects
the deopt environment to reflect the stack of unoptimized code (without
additional pushed objects).
Issue https://github.com/dart-lang/sdk/issues/40753
Change-Id: I6c7bebc53ce82f5d18cf94e1c95ddebd943efa8c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/141980
Commit-Queue: Martin Kustermann <kustermann@google.com>
Reviewed-by: Tess Strickland <sstrickl@google.com>
diff --git a/runtime/vm/compiler/backend/il.cc b/runtime/vm/compiler/backend/il.cc
index 80958c4..a4182ca 100644
--- a/runtime/vm/compiler/backend/il.cc
+++ b/runtime/vm/compiler/backend/il.cc
@@ -4079,6 +4079,35 @@
__ Bind(&no_call);
}
+LocationSummary* InitInstanceFieldInstr::MakeLocationSummary(Zone* zone,
+ bool opt) const {
+ const intptr_t kNumInputs = 1;
+ const intptr_t kNumTemps = 0;
+ auto const locs = new (zone)
+ LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kCall);
+ locs->set_in(0,
+ Location::RegisterLocation(InitInstanceFieldABI::kInstanceReg));
+ return locs;
+}
+
+void InitInstanceFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
+ const Register temp = InitInstanceFieldABI::kFieldReg;
+
+ __ LoadField(temp, compiler::FieldAddress(InitInstanceFieldABI::kInstanceReg,
+ field().TargetOffset()));
+
+ compiler::Label no_call;
+ __ CompareObject(temp, Object::sentinel());
+ __ BranchIf(NOT_EQUAL, &no_call);
+
+ __ LoadObject(InitInstanceFieldABI::kFieldReg,
+ Field::ZoneHandle(field().Original()));
+ compiler->GenerateCallWithDeopt(token_pos(), deopt_id(),
+ StubCode::InitInstanceField(),
+ /*kind=*/RawPcDescriptors::kOther, locs());
+ __ Bind(&no_call);
+}
+
LocationSummary* PhiInstr::MakeLocationSummary(Zone* zone,
bool optimizing) const {
UNREACHABLE();
diff --git a/runtime/vm/compiler/backend/il_arm.cc b/runtime/vm/compiler/backend/il_arm.cc
index a765a18..fccd02f 100644
--- a/runtime/vm/compiler/backend/il_arm.cc
+++ b/runtime/vm/compiler/backend/il_arm.cc
@@ -3478,35 +3478,6 @@
RawPcDescriptors::kOther, locs());
}
-LocationSummary* InitInstanceFieldInstr::MakeLocationSummary(Zone* zone,
- bool opt) const {
- const intptr_t kNumInputs = 1;
- const intptr_t kNumTemps = 1;
- LocationSummary* locs = new (zone)
- LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kCall);
- locs->set_in(0, Location::RegisterLocation(R0));
- locs->set_temp(0, Location::RegisterLocation(R1));
- return locs;
-}
-
-void InitInstanceFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
- Register instance = locs()->in(0).reg();
- Register temp = locs()->temp(0).reg();
- compiler::Label no_call;
-
- __ ldr(temp, compiler::FieldAddress(instance, field().TargetOffset()));
- __ CompareObject(temp, Object::sentinel());
- __ b(&no_call, NE);
-
- __ PushObject(Object::null_object()); // Make room for (unused) result.
- __ Push(instance);
- __ PushObject(Field::ZoneHandle(field().Original()));
- compiler->GenerateRuntimeCall(token_pos(), deopt_id(),
- kInitInstanceFieldRuntimeEntry, 2, locs());
- __ Drop(3); // Remove arguments and result placeholder.
- __ Bind(&no_call);
-}
-
LocationSummary* CloneContextInstr::MakeLocationSummary(Zone* zone,
bool opt) const {
const intptr_t kNumInputs = 1;
diff --git a/runtime/vm/compiler/backend/il_arm64.cc b/runtime/vm/compiler/backend/il_arm64.cc
index 2c73987..8463a5e 100644
--- a/runtime/vm/compiler/backend/il_arm64.cc
+++ b/runtime/vm/compiler/backend/il_arm64.cc
@@ -2968,34 +2968,6 @@
RawPcDescriptors::kOther, locs());
}
-LocationSummary* InitInstanceFieldInstr::MakeLocationSummary(Zone* zone,
- bool opt) const {
- const intptr_t kNumInputs = 1;
- const intptr_t kNumTemps = 1;
- LocationSummary* locs = new (zone)
- LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kCall);
- locs->set_in(0, Location::RegisterLocation(R0));
- locs->set_temp(0, Location::RegisterLocation(R1));
- return locs;
-}
-
-void InitInstanceFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
- Register instance = locs()->in(0).reg();
- Register temp = locs()->temp(0).reg();
- compiler::Label no_call;
-
- __ ldr(temp, compiler::FieldAddress(instance, field().TargetOffset()));
- __ CompareObject(temp, Object::sentinel());
- __ b(&no_call, NE);
-
- __ PushPair(instance, ZR); // Make room for (unused) result.
- __ PushObject(Field::ZoneHandle(field().Original()));
- compiler->GenerateRuntimeCall(token_pos(), deopt_id(),
- kInitInstanceFieldRuntimeEntry, 2, locs());
- __ Drop(3); // Remove arguments and result placeholder.
- __ Bind(&no_call);
-}
-
LocationSummary* CloneContextInstr::MakeLocationSummary(Zone* zone,
bool opt) const {
const intptr_t kNumInputs = 1;
diff --git a/runtime/vm/compiler/backend/il_ia32.cc b/runtime/vm/compiler/backend/il_ia32.cc
index 07851c4..69252ec 100644
--- a/runtime/vm/compiler/backend/il_ia32.cc
+++ b/runtime/vm/compiler/backend/il_ia32.cc
@@ -2653,36 +2653,6 @@
RawPcDescriptors::kOther, locs());
}
-LocationSummary* InitInstanceFieldInstr::MakeLocationSummary(Zone* zone,
- bool opt) const {
- const intptr_t kNumInputs = 1;
- const intptr_t kNumTemps = 1;
- LocationSummary* locs = new (zone)
- LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kCall);
- locs->set_in(0, Location::RegisterLocation(EAX));
- locs->set_temp(0, Location::RegisterLocation(ECX));
- return locs;
-}
-
-void InitInstanceFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
- Register instance = locs()->in(0).reg();
- Register temp = locs()->temp(0).reg();
-
- compiler::Label no_call;
-
- __ movl(temp, compiler::FieldAddress(instance, field().TargetOffset()));
- __ CompareObject(temp, Object::sentinel());
- __ j(NOT_EQUAL, &no_call, compiler::Assembler::kNearJump);
-
- __ pushl(compiler::Immediate(0)); // Make room for (unused) result.
- __ pushl(instance);
- __ PushObject(Field::ZoneHandle(field().Original()));
- compiler->GenerateRuntimeCall(token_pos(), deopt_id(),
- kInitInstanceFieldRuntimeEntry, 2, locs());
- __ Drop(3); // Remove arguments and unused result.
- __ Bind(&no_call);
-}
-
LocationSummary* CloneContextInstr::MakeLocationSummary(Zone* zone,
bool opt) const {
const intptr_t kNumInputs = 1;
diff --git a/runtime/vm/compiler/backend/il_x64.cc b/runtime/vm/compiler/backend/il_x64.cc
index ddb0a2f..5497ca0 100644
--- a/runtime/vm/compiler/backend/il_x64.cc
+++ b/runtime/vm/compiler/backend/il_x64.cc
@@ -2960,36 +2960,6 @@
RawPcDescriptors::kOther, locs());
}
-LocationSummary* InitInstanceFieldInstr::MakeLocationSummary(Zone* zone,
- bool opt) const {
- const intptr_t kNumInputs = 1;
- const intptr_t kNumTemps = 1;
- LocationSummary* locs = new (zone)
- LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kCall);
- locs->set_in(0, Location::RegisterLocation(RAX));
- locs->set_temp(0, Location::RegisterLocation(RCX));
- return locs;
-}
-
-void InitInstanceFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
- Register instance = locs()->in(0).reg();
- Register temp = locs()->temp(0).reg();
-
- compiler::Label no_call;
-
- __ movq(temp, compiler::FieldAddress(instance, field().TargetOffset()));
- __ CompareObject(temp, Object::sentinel());
- __ j(NOT_EQUAL, &no_call, compiler::Assembler::kNearJump);
-
- __ pushq(compiler::Immediate(0)); // Make room for (unused) result.
- __ pushq(instance);
- __ PushObject(Field::ZoneHandle(field().Original()));
- compiler->GenerateRuntimeCall(token_pos(), deopt_id(),
- kInitInstanceFieldRuntimeEntry, 2, locs());
- __ Drop(3); // Remove arguments and unused result.
- __ Bind(&no_call);
-}
-
LocationSummary* CloneContextInstr::MakeLocationSummary(Zone* zone,
bool opt) const {
const intptr_t kNumInputs = 1;
diff --git a/runtime/vm/compiler/stub_code_compiler.cc b/runtime/vm/compiler/stub_code_compiler.cc
index 3e6c845..60c3006 100644
--- a/runtime/vm/compiler/stub_code_compiler.cc
+++ b/runtime/vm/compiler/stub_code_compiler.cc
@@ -29,6 +29,17 @@
__ Ret();
}
+void StubCodeCompiler::GenerateInitInstanceFieldStub(Assembler* assembler) {
+ __ EnterStubFrame();
+ __ PushObject(NullObject()); // Make room for (unused) result.
+ __ PushRegister(InitInstanceFieldABI::kInstanceReg);
+ __ PushRegister(InitInstanceFieldABI::kFieldReg);
+ __ CallRuntime(kInitInstanceFieldRuntimeEntry, /*argument_count=*/2);
+ __ Drop(3);
+ __ LeaveStubFrame();
+ __ Ret();
+}
+
} // namespace compiler
} // namespace dart
diff --git a/runtime/vm/constants_arm.h b/runtime/vm/constants_arm.h
index 8015373..e3b1921 100644
--- a/runtime/vm/constants_arm.h
+++ b/runtime/vm/constants_arm.h
@@ -347,6 +347,12 @@
static const Register kFieldReg = R0;
};
+// ABI for InitInstanceField.
+struct InitInstanceFieldABI {
+ static const Register kInstanceReg = R0;
+ static const Register kFieldReg = R1;
+};
+
// TODO(regis): Add ABIs for type testing stubs and is-type test stubs instead
// of reusing the constants of the instantiation stubs ABI.
diff --git a/runtime/vm/constants_arm64.h b/runtime/vm/constants_arm64.h
index 69dab7e..dd18637 100644
--- a/runtime/vm/constants_arm64.h
+++ b/runtime/vm/constants_arm64.h
@@ -179,6 +179,12 @@
static const Register kFieldReg = R0;
};
+// ABI for InitInstanceField.
+struct InitInstanceFieldABI {
+ static const Register kInstanceReg = R0;
+ static const Register kFieldReg = R1;
+};
+
// TODO(regis): Add ABIs for type testing stubs and is-type test stubs instead
// of reusing the constants of the instantiation stubs ABI.
diff --git a/runtime/vm/constants_ia32.h b/runtime/vm/constants_ia32.h
index 00e1e97..64f201b 100644
--- a/runtime/vm/constants_ia32.h
+++ b/runtime/vm/constants_ia32.h
@@ -116,6 +116,12 @@
static const Register kFieldReg = EAX;
};
+// ABI for InitInstanceField.
+struct InitInstanceFieldABI {
+ static const Register kInstanceReg = EAX;
+ static const Register kFieldReg = EBX;
+};
+
typedef uint32_t RegList;
const RegList kAllCpuRegistersList = 0xFF;
diff --git a/runtime/vm/constants_x64.h b/runtime/vm/constants_x64.h
index d29a0d4..f745d9d 100644
--- a/runtime/vm/constants_x64.h
+++ b/runtime/vm/constants_x64.h
@@ -160,6 +160,12 @@
static const Register kFieldReg = RAX;
};
+// ABI for InitInstanceField.
+struct InitInstanceFieldABI {
+ static const Register kInstanceReg = RAX;
+ static const Register kFieldReg = RBX;
+};
+
// Registers used inside the implementation of type testing stubs.
struct TTSInternalRegs {
static const Register kInstanceTypeArgumentsReg = RSI;
diff --git a/runtime/vm/stub_code_list.h b/runtime/vm/stub_code_list.h
index 3554661..c75b285 100644
--- a/runtime/vm/stub_code_list.h
+++ b/runtime/vm/stub_code_list.h
@@ -87,6 +87,7 @@
V(ExitSafepoint) \
V(CallNativeThroughSafepoint) \
V(InitStaticField) \
+ V(InitInstanceField) \
V(InstantiateTypeArguments) \
V(InstantiateTypeArgumentsMayShareInstantiatorTA) \
V(InstantiateTypeArgumentsMayShareFunctionTA)
