Patchable AllocateArray stub, like instance allocation stubs.

runtime/vm/stub_code_ia32.cc

Index: runtime/vm/stub_code_ia32.cc
===================================================================
--- runtime/vm/stub_code_ia32.cc	(revision 40629)
+++ runtime/vm/stub_code_ia32.cc	(working copy)
@@ -394,15 +394,21 @@
 }
 
 
-// Called from object allocate instruction when the allocation stub has been
-// disabled.
+// Called from object or array allocate instruction when the allocation stub has
+// been disabled.
+// EDX: if called for array, the length (preserved).
+// ECX: if called for array, the element type (preserved).
 void StubCode::GenerateFixAllocationStubTargetStub(Assembler* assembler) {
   const Immediate& raw_null =
       Immediate(reinterpret_cast<intptr_t>(Object::null()));
   __ EnterStubFrame();
+  __ pushl(EDX);       // Preserve length.
+  __ pushl(ECX);       // Preserve element type.

[srdjan, 2014/09/25 17:42:53]

For non-arays, EDX and ECX can contain non-object, in which case you cannot push
them on stack. You can solve that by having a special FixArrayAllocation stub.

[koda, 2014/09/25 21:49:25]

Done.

   __ pushl(raw_null);  // Setup space on stack for return value.
   __ CallRuntime(kFixAllocationStubTargetRuntimeEntry, 0);
   __ popl(EAX);  // Get Code object.
+  __ popl(ECX);  // Restore element type.
+  __ popl(EDX);  // Restore length.
   __ movl(EAX, FieldAddress(EAX, Code::instructions_offset()));
   __ addl(EAX, Immediate(Instructions::HeaderSize() - kHeapObjectTag));
   __ LeaveFrame();
@@ -422,7 +428,9 @@
 
   // Allocate array to store arguments of caller.
   __ movl(ECX, raw_null);  // Null element type for raw Array.
-  __ call(&stub_code->AllocateArrayLabel());
+  const Code& array_stub = Code::Handle(stub_code->GetAllocateArrayStub());
+  const ExternalLabel array_label(array_stub.EntryPoint());
+  __ call(&array_label);
   __ SmiUntag(EDX);
   // EAX: newly allocated array.
   // EDX: length of the array (was preserved by the stub).
@@ -610,7 +618,9 @@
 //   ECX : array element type (either NULL or an instantiated type).
 // Uses EAX, EBX, ECX, EDI  as temporary registers.
 // The newly allocated object is returned in EAX.
-void StubCode::GenerateAllocateArrayStub(Assembler* assembler) {
+void StubCode::GeneratePatchableAllocateArrayStub(Assembler* assembler,
+    uword* entry_patch_offset, uword* patch_code_pc_offset) {
+  *entry_patch_offset = assembler->CodeSize();
   Label slow_case;
   const Immediate& raw_null =
       Immediate(reinterpret_cast<intptr_t>(Object::null()));
@@ -738,6 +748,11 @@
   __ popl(EAX);  // Pop return value from return slot.
   __ LeaveFrame();
   __ ret();
+  // Emit function patching code. This will be swapped with the first 5 bytes
+  // at entry point.
+  *patch_code_pc_offset = assembler->CodeSize();
+  StubCode* stub_code = Isolate::Current()->stub_code();
+  __ jmp(&stub_code->FixAllocationStubTargetLabel());
 }