Index: runtime/vm/intermediate_language_ia32.cc |
diff --git a/runtime/vm/intermediate_language_ia32.cc b/runtime/vm/intermediate_language_ia32.cc |
index 2865b2611398e6a0fe35dc3859091dd47ff05400..49102cbe6098ed72016a213d5bde3bb3aa99c04c 100644 |
--- a/runtime/vm/intermediate_language_ia32.cc |
+++ b/runtime/vm/intermediate_language_ia32.cc |
@@ -818,7 +818,6 @@ void NativeCallInstr::EmitNativeCode(FlowGraphCompiler* compiler) { |
const intptr_t argc_tag = NativeArguments::ComputeArgcTag(function()); |
const bool is_leaf_call = |
(argc_tag & NativeArguments::AutoSetupScopeMask()) == 0; |
- StubCode* stub_code = compiler->isolate()->stub_code(); |
// Push the result place holder initialized to NULL. |
__ PushObject(Object::null_object()); |
@@ -832,8 +831,8 @@ void NativeCallInstr::EmitNativeCode(FlowGraphCompiler* compiler) { |
__ movl(ECX, Immediate(reinterpret_cast<uword>(native_c_function()))); |
__ movl(EDX, Immediate(argc_tag)); |
const ExternalLabel* stub_entry = (is_bootstrap_native() || is_leaf_call) ? |
- &stub_code->CallBootstrapCFunctionLabel() : |
- &stub_code->CallNativeCFunctionLabel(); |
+ &StubCode::CallBootstrapCFunctionLabel() : |
+ &StubCode::CallNativeCFunctionLabel(); |
compiler->GenerateCall(token_pos(), |
stub_entry, |
RawPcDescriptors::kOther, |
@@ -1650,7 +1649,6 @@ class BoxAllocationSlowPath : public SlowPathCode { |
virtual void EmitNativeCode(FlowGraphCompiler* compiler) { |
Isolate* isolate = compiler->isolate(); |
- StubCode* stub_code = isolate->stub_code(); |
if (Assembler::EmittingComments()) { |
__ Comment("%s slow path allocation of %s", |
@@ -1659,7 +1657,7 @@ class BoxAllocationSlowPath : public SlowPathCode { |
} |
__ Bind(entry_label()); |
const Code& stub = |
- Code::Handle(isolate, stub_code->GetAllocationStubForClass(cls_)); |
+ Code::Handle(isolate, StubCode::GetAllocationStubForClass(cls_)); |
const ExternalLabel label(stub.EntryPoint()); |
LocationSummary* locs = instruction_->locs(); |
@@ -2128,15 +2126,11 @@ void CreateArrayInstr::EmitNativeCode(FlowGraphCompiler* compiler) { |
} |
__ Bind(&slow_path); |
- Isolate* isolate = compiler->isolate(); |
- const Code& stub = Code::Handle( |
- isolate, isolate->stub_code()->GetAllocateArrayStub()); |
- const ExternalLabel label(stub.EntryPoint()); |
+ const ExternalLabel label(StubCode::AllocateArrayEntryPoint()); |
compiler->GenerateCall(token_pos(), |
&label, |
RawPcDescriptors::kOther, |
locs()); |
- compiler->AddStubCallTarget(stub); |
__ Bind(&done); |
ASSERT(locs()->out(0).reg() == kResultReg); |
} |
@@ -2404,8 +2398,7 @@ class AllocateContextSlowPath : public SlowPathCode { |
compiler->SaveLiveRegisters(locs); |
__ movl(EDX, Immediate(instruction_->num_context_variables())); |
- StubCode* stub_code = compiler->isolate()->stub_code(); |
- const ExternalLabel label(stub_code->AllocateContextEntryPoint()); |
+ const ExternalLabel label(StubCode::AllocateContextEntryPoint()); |
compiler->GenerateCall(instruction_->token_pos(), |
&label, |
RawPcDescriptors::kOther, |
@@ -2460,8 +2453,7 @@ void AllocateContextInstr::EmitNativeCode(FlowGraphCompiler* compiler) { |
ASSERT(locs()->out(0).reg() == EAX); |
__ movl(EDX, Immediate(num_context_variables())); |
- StubCode* stub_code = compiler->isolate()->stub_code(); |
- const ExternalLabel label(stub_code->AllocateContextEntryPoint()); |
+ const ExternalLabel label(StubCode::AllocateContextEntryPoint()); |
compiler->GenerateCall(token_pos(), |
&label, |
RawPcDescriptors::kOther, |
@@ -6802,9 +6794,8 @@ LocationSummary* AllocateObjectInstr::MakeLocationSummary(Zone* zone, |
void AllocateObjectInstr::EmitNativeCode(FlowGraphCompiler* compiler) { |
Isolate* isolate = compiler->isolate(); |
- StubCode* stub_code = isolate->stub_code(); |
const Code& stub = Code::Handle(isolate, |
- stub_code->GetAllocationStubForClass(cls())); |
+ StubCode::GetAllocationStubForClass(cls())); |
const ExternalLabel label(stub.EntryPoint()); |
compiler->GenerateCall(token_pos(), |
&label, |
@@ -6817,8 +6808,7 @@ void AllocateObjectInstr::EmitNativeCode(FlowGraphCompiler* compiler) { |
void DebugStepCheckInstr::EmitNativeCode(FlowGraphCompiler* compiler) { |
ASSERT(!compiler->is_optimizing()); |
- StubCode* stub_code = compiler->isolate()->stub_code(); |
- const ExternalLabel label(stub_code->DebugStepCheckEntryPoint()); |
+ const ExternalLabel label(StubCode::DebugStepCheckEntryPoint()); |
compiler->GenerateCall(token_pos(), &label, stub_kind_, locs()); |
} |