[VM] Move any updates to static call targets array into the flow graph compiler
We already do this for static calls, with this CL we'll also do it for stub calls.
Change-Id: I2ec78a94165472d4a197f78a5789336b1b29e089
Reviewed-on: https://dart-review.googlesource.com/71402
Reviewed-by: Vyacheslav Egorov <vegorov@google.com>
Commit-Queue: Martin Kustermann <kustermann@google.com>
diff --git a/runtime/vm/compiler/backend/flow_graph_compiler_arm.cc b/runtime/vm/compiler/backend/flow_graph_compiler_arm.cc
index 1cccc8f..8762e1b 100644
--- a/runtime/vm/compiler/backend/flow_graph_compiler_arm.cc
+++ b/runtime/vm/compiler/backend/flow_graph_compiler_arm.cc
@@ -913,6 +913,7 @@
LocationSummary* locs) {
__ BranchLink(stub_entry);
EmitCallsiteMetadata(token_pos, Thread::kNoDeoptId, kind, locs);
+ AddStubCallTarget(Code::ZoneHandle(stub_entry.code()));
}
void FlowGraphCompiler::GeneratePatchableCall(TokenPosition token_pos,
diff --git a/runtime/vm/compiler/backend/flow_graph_compiler_arm64.cc b/runtime/vm/compiler/backend/flow_graph_compiler_arm64.cc
index b63c05b..358afcf 100644
--- a/runtime/vm/compiler/backend/flow_graph_compiler_arm64.cc
+++ b/runtime/vm/compiler/backend/flow_graph_compiler_arm64.cc
@@ -893,6 +893,7 @@
LocationSummary* locs) {
__ BranchLink(stub_entry);
EmitCallsiteMetadata(token_pos, Thread::kNoDeoptId, kind, locs);
+ AddStubCallTarget(Code::ZoneHandle(stub_entry.code()));
}
void FlowGraphCompiler::GeneratePatchableCall(TokenPosition token_pos,
diff --git a/runtime/vm/compiler/backend/flow_graph_compiler_ia32.cc b/runtime/vm/compiler/backend/flow_graph_compiler_ia32.cc
index 821d8c3..69dae4c 100644
--- a/runtime/vm/compiler/backend/flow_graph_compiler_ia32.cc
+++ b/runtime/vm/compiler/backend/flow_graph_compiler_ia32.cc
@@ -852,6 +852,7 @@
LocationSummary* locs) {
__ Call(stub_entry);
EmitCallsiteMetadata(token_pos, Thread::kNoDeoptId, kind, locs);
+ AddStubCallTarget(Code::ZoneHandle(stub_entry.code()));
}
void FlowGraphCompiler::GenerateDartCall(intptr_t deopt_id,
diff --git a/runtime/vm/compiler/backend/flow_graph_compiler_x64.cc b/runtime/vm/compiler/backend/flow_graph_compiler_x64.cc
index dc52909..3259e3e 100644
--- a/runtime/vm/compiler/backend/flow_graph_compiler_x64.cc
+++ b/runtime/vm/compiler/backend/flow_graph_compiler_x64.cc
@@ -902,6 +902,7 @@
LocationSummary* locs) {
__ Call(stub_entry);
EmitCallsiteMetadata(token_pos, Thread::kNoDeoptId, kind, locs);
+ AddStubCallTarget(Code::ZoneHandle(stub_entry.code()));
}
void FlowGraphCompiler::GeneratePatchableCall(TokenPosition token_pos,
diff --git a/runtime/vm/compiler/backend/il_arm.cc b/runtime/vm/compiler/backend/il_arm.cc
index 290267c..44982d3 100644
--- a/runtime/vm/compiler/backend/il_arm.cc
+++ b/runtime/vm/compiler/backend/il_arm.cc
@@ -2043,7 +2043,6 @@
compiler->SaveLiveRegisters(locs);
compiler->GenerateCall(TokenPosition::kNoSource, // No token position.
stub_entry, RawPcDescriptors::kOther, locs);
- compiler->AddStubCallTarget(stub);
__ MoveRegister(result_, R0);
compiler->RestoreLiveRegisters(locs);
__ b(exit_label());
@@ -2569,9 +2568,6 @@
return;
}
}
- const Code& stub = Code::ZoneHandle(compiler->zone(),
- StubCode::AllocateArray_entry()->code());
- compiler->AddStubCallTarget(stub);
compiler->GenerateCallWithDeopt(token_pos(), deopt_id(),
*StubCode::AllocateArray_entry(),
RawPcDescriptors::kOther, locs());
@@ -2849,9 +2845,6 @@
compiler->SaveLiveRegisters(locs);
__ LoadImmediate(R1, instruction()->num_context_variables());
- const Code& stub = Code::ZoneHandle(
- compiler->zone(), StubCode::AllocateContext_entry()->code());
- compiler->AddStubCallTarget(stub);
compiler->GenerateCall(instruction()->token_pos(),
*StubCode::AllocateContext_entry(),
RawPcDescriptors::kOther, locs);
@@ -6750,7 +6743,6 @@
const StubEntry stub_entry(stub);
compiler->GenerateCall(token_pos(), stub_entry, RawPcDescriptors::kOther,
locs());
- compiler->AddStubCallTarget(stub);
__ Drop(ArgumentCount()); // Discard arguments.
}
diff --git a/runtime/vm/compiler/backend/il_arm64.cc b/runtime/vm/compiler/backend/il_arm64.cc
index dc73b6f..6fb2171 100644
--- a/runtime/vm/compiler/backend/il_arm64.cc
+++ b/runtime/vm/compiler/backend/il_arm64.cc
@@ -1868,7 +1868,6 @@
compiler->SaveLiveRegisters(locs);
compiler->GenerateCall(TokenPosition::kNoSource, // No token position.
stub_entry, RawPcDescriptors::kOther, locs);
- compiler->AddStubCallTarget(stub);
__ mov(result_, R0);
compiler->RestoreLiveRegisters(locs);
__ b(exit_label());
@@ -2271,9 +2270,6 @@
return;
}
}
- const Code& stub = Code::ZoneHandle(compiler->zone(),
- StubCode::AllocateArray_entry()->code());
- compiler->AddStubCallTarget(stub);
compiler->GenerateCallWithDeopt(token_pos(), deopt_id(),
*StubCode::AllocateArray_entry(),
RawPcDescriptors::kOther, locs());
@@ -2543,9 +2539,6 @@
compiler->SaveLiveRegisters(locs);
__ LoadImmediate(R1, instruction()->num_context_variables());
- const Code& stub = Code::ZoneHandle(
- compiler->zone(), StubCode::AllocateContext_entry()->code());
- compiler->AddStubCallTarget(stub);
compiler->GenerateCall(instruction()->token_pos(),
*StubCode::AllocateContext_entry(),
RawPcDescriptors::kOther, locs);
@@ -5993,7 +5986,6 @@
const StubEntry stub_entry(stub);
compiler->GenerateCall(token_pos(), stub_entry, RawPcDescriptors::kOther,
locs());
- compiler->AddStubCallTarget(stub);
__ Drop(ArgumentCount()); // Discard arguments.
}
diff --git a/runtime/vm/compiler/backend/il_ia32.cc b/runtime/vm/compiler/backend/il_ia32.cc
index bcc4b04..e6d79eb 100644
--- a/runtime/vm/compiler/backend/il_ia32.cc
+++ b/runtime/vm/compiler/backend/il_ia32.cc
@@ -1744,7 +1744,6 @@
compiler->SaveLiveRegisters(locs);
compiler->GenerateCall(TokenPosition::kNoSource, stub_entry,
RawPcDescriptors::kOther, locs);
- compiler->AddStubCallTarget(stub);
__ MoveRegister(result_, EAX);
compiler->RestoreLiveRegisters(locs);
__ jmp(exit_label());
@@ -2146,9 +2145,6 @@
}
__ Bind(&slow_path);
- const Code& stub = Code::ZoneHandle(compiler->zone(),
- StubCode::AllocateArray_entry()->code());
- compiler->AddStubCallTarget(stub);
compiler->GenerateCallWithDeopt(token_pos(), deopt_id(),
*StubCode::AllocateArray_entry(),
RawPcDescriptors::kOther, locs());
@@ -2422,9 +2418,6 @@
compiler->SaveLiveRegisters(locs);
__ movl(EDX, Immediate(instruction()->num_context_variables()));
- const Code& stub = Code::ZoneHandle(
- compiler->zone(), StubCode::AllocateContext_entry()->code());
- compiler->AddStubCallTarget(stub);
compiler->GenerateCall(instruction()->token_pos(),
*StubCode::AllocateContext_entry(),
RawPcDescriptors::kOther, locs);
@@ -6181,7 +6174,6 @@
const StubEntry stub_entry(stub);
compiler->GenerateCall(token_pos(), stub_entry, RawPcDescriptors::kOther,
locs());
- compiler->AddStubCallTarget(stub);
__ Drop(ArgumentCount()); // Discard arguments.
}
diff --git a/runtime/vm/compiler/backend/il_x64.cc b/runtime/vm/compiler/backend/il_x64.cc
index 7379b83..b6fbb07 100644
--- a/runtime/vm/compiler/backend/il_x64.cc
+++ b/runtime/vm/compiler/backend/il_x64.cc
@@ -1037,7 +1037,6 @@
compiler->SaveLiveRegisters(locs);
compiler->GenerateCall(TokenPosition::kNoSource, // No token position.
stub_entry, RawPcDescriptors::kOther, locs);
- compiler->AddStubCallTarget(stub);
__ MoveRegister(result_, RAX);
compiler->RestoreLiveRegisters(locs);
__ jmp(exit_label());
@@ -2267,9 +2266,6 @@
}
__ Bind(&slow_path);
- const Code& stub = Code::ZoneHandle(compiler->zone(),
- StubCode::AllocateArray_entry()->code());
- compiler->AddStubCallTarget(stub);
compiler->GenerateCallWithDeopt(token_pos(), deopt_id(),
*StubCode::AllocateArray_entry(),
RawPcDescriptors::kOther, locs());
@@ -2539,9 +2535,6 @@
compiler->SaveLiveRegisters(locs);
__ LoadImmediate(R10, Immediate(instruction()->num_context_variables()));
- const Code& stub = Code::ZoneHandle(
- compiler->zone(), StubCode::AllocateContext_entry()->code());
- compiler->AddStubCallTarget(stub);
compiler->GenerateCall(instruction()->token_pos(),
*StubCode::AllocateContext_entry(),
RawPcDescriptors::kOther, locs);
@@ -6287,7 +6280,6 @@
const StubEntry stub_entry(stub);
compiler->GenerateCall(token_pos(), stub_entry, RawPcDescriptors::kOther,
locs());
- compiler->AddStubCallTarget(stub);
__ Drop(ArgumentCount()); // Discard arguments.
}
