Push raw_null instead of smi 0 in all places were we setup the return value location before calli...

vm/stub_code_ia32.cc

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/globals.h"
 #if defined(TARGET_ARCH_IA32)
 
 #include "vm/code_generator.h"
 #include "vm/compiler.h"
 #include "vm/ic_data.h"
@@ skipping 402 matching lines @@
   // TOS + 2: Last argument of caller.
   // ....
   // Total number of args is the first Smi in args descriptor array (EDX).
   __ movl(EAX, FieldAddress(EDX, Array::data_offset()));
   __ movl(EAX, Address(ESP, EAX, TIMES_2, kWordSize));  // Get receiver.
   __ pushl(EDX);  // Preserve arguments descriptor array.
   __ pushl(EAX);  // Preserve receiver.
   __ pushl(ECX);  // Preserve ic-data array.
   // First resolve the function to get the function object.
 
-  // Setup space for return value on stack by pushing smi 0.
-  __ pushl(Immediate(0));
+  __ pushl(raw_null);  // Setup space on stack for return value.
   __ pushl(EAX);  // Push receiver.
   __ CallRuntimeFromStub(kResolveCompileInstanceFunctionRuntimeEntry);
   __ popl(EAX);  // Remove receiver pushed earlier.
   __ popl(ECX);  // Pop returned code object into ECX.
   // Pop preserved values
   __ popl(EDX);  // Restore ic-data array.
   __ popl(EAX);  // Restore receiver.
   __ popl(EDI);  // Restore arguments descriptor array.
 
   __ cmpl(ECX, raw_null);
@@ skipping 14 matching lines @@
   // ECX: raw_null.
   // EDI: arguments descriptor array.
   // The target function was not found.
   // First check to see if this is a getter function and we are
   // trying to create a closure of an instance function.
   // Push values that need to be preserved across runtime call.
   __ pushl(EAX);  // Preserve receiver.
   __ pushl(EDX);  // Preserve ic-data array.
   __ pushl(EDI);  // Preserve arguments descriptor array.
 
-  __ pushl(Immediate(0));
+  __ pushl(raw_null);  // Setup space on stack for return value.
   __ pushl(EAX);  // Push receiver.
   __ pushl(EDX);  // Ic-data array.
   __ CallRuntimeFromStub(kResolveImplicitClosureFunctionRuntimeEntry);
   __ popl(EAX);
   __ popl(EAX);
   __ popl(ECX);  // Get return value into ECX, might be Closure object.
 
   // Pop preserved values.
   __ popl(EDI);  // Restore arguments descriptor array.
   __ popl(EDX);  // Restore ic-data array.
@@ skipping 14 matching lines @@
   // ECX: raw_null.
   // EDI: arguments descriptor array.
   // This is not the case of an instance so invoke the getter of the
   // same name and see if we get a closure back which we are then
   // supposed to invoke.
   // Push values that need to be preserved across runtime call.
   __ pushl(EAX);  // Preserve receiver.
   __ pushl(EDX);  // Preserve ic-data array.
   __ pushl(EDI);  // Preserve arguments descriptor array.
 
-  __ pushl(Immediate(0));
+  __ pushl(raw_null);  // Setup space on stack for return value.
   __ pushl(EAX);  // Push receiver.
   __ pushl(EDX);  // Ic-data array.
   __ CallRuntimeFromStub(kResolveImplicitClosureThroughGetterRuntimeEntry);
   __ popl(EDX);  // Pop argument.
   __ popl(EAX);  // Pop argument.
   __ popl(ECX);  // get return value into ECX, might be Closure object.
 
   // Pop preserved values.
   __ popl(EDI);  // Restore arguments descriptor array.
   __ popl(EDX);  // Restore ic-data array.
   __ popl(EAX);  // Restore receiver.
 
   __ cmpl(ECX, raw_null);
   Label function_not_found;
   __ j(EQUAL, &function_not_found, Assembler::kNearJump);
 
   // ECX: Closure object.
   // EDI: Arguments descriptor array.
-  __ pushl(Immediate(0));  // Result from invoking Closure.
+  __ pushl(raw_null);  // Setup space on stack for result from invoking Closure.
   __ pushl(ECX);  // Closure object.
   __ pushl(EDI);  // Arguments descriptor.
   __ movl(EDI, FieldAddress(EDI, Array::data_offset()));
   __ SmiUntag(EDI);
   __ subl(EDI, Immediate(1));  // Arguments array length, minus the receiver.
   PushArgumentsArray(assembler, (kWordSize * 5));
   // Stack layout explaining "(kWordSize * 5)" offset.
   // TOS + 0: Argument array.
   // TOS + 1: Arguments descriptor array.
   // TOS + 2: Closure object.
@@ skipping 15 matching lines @@
   __ ret();
 
   __ Bind(&function_not_found);
   // The target function was not found, so invoke method
   // "void noSuchMethod(function_name, args_array)".
   //   EAX: receiver.
   //   EDX: ic-data array.
   //   ECX: raw_null.
   //   EDI: argument descriptor array.
 
-  // Setup space for return value on stack by pushing smi 0.
-  __ pushl(Immediate(0));  // Result from noSuchMethod.
+  __ pushl(raw_null);  // Setup space on stack for result from noSuchMethod.
   __ pushl(EAX);  // Receiver.
   __ pushl(EDX);  // IC-data array.
   __ pushl(EDI);  // Argument descriptor array.
   __ movl(EDI, FieldAddress(EDI, Array::data_offset()));
   __ SmiUntag(EDI);
   __ subl(EDI, Immediate(1));  // Arguments array length, minus the receiver.
   // See stack layout below explaining "wordSize * 6" offset.
   PushArgumentsArray(assembler, (kWordSize * 6));
 
   // Stack:
@@ skipping 134 matching lines @@
 
     // Done allocating and initializing the array.
     // EAX: new object.
     __ ret();
   }
 
   // Unable to allocate the array using the fast inline code, just call
   // into the runtime.
   __ Bind(&slow_case);
   __ EnterFrame(0);
-  __ pushl(raw_null);  // Push Null object for return value.
+  __ pushl(raw_null);  // Setup space on stack for return value.
   __ pushl(EDX);  // Array length as Smi.
   __ pushl(ECX);  // Element type.
   __ pushl(raw_null);  // Null instantiator.
   __ CallRuntimeFromStub(kAllocateArrayRuntimeEntry);
   __ popl(EAX);  // Pop instantiator.
   __ popl(EAX);  // Pop element type argument.
   __ popl(EDX);  // Pop array length argument.
   __ popl(EAX);  // Pop return value from return slot.
   __ LeaveFrame();
   __ ret();
@@ skipping 71 matching lines @@
   // Call runtime to report that a closure call was attempted on a non-closure
   // object, passing the non-closure object and its arguments array.
   // EDI: non-closure object.
   // EDX: arguments descriptor array (num_args is first Smi element, closure
   //      object is not included in num_args).
 
   // Create a stub frame as we are pushing some objects on the stack before
   // calling into the runtime.
   __ EnterFrame(0);
 
-  // Setup space for return value on stack by pushing smi 0.
-  __ pushl(Immediate(0));  // Result from reporting the error.
+  __ pushl(raw_null);  // Setup space on stack for result from error reporting.
   __ pushl(EDI);  // Non-closure object.
     // Total number of args is the first Smi in args descriptor array (EDX).
   __ movl(EDI, FieldAddress(EDX, Array::data_offset()));  // Load num_args.
   __ SmiUntag(EDI);
   // See stack layout below explaining "wordSize * 4" offset.
   PushArgumentsArray(assembler, (kWordSize * 4));
 
   // Stack:
   // TOS + 0: Argument array.
   // TOS + 1: Non-closure object.
@@ skipping 122 matching lines @@
 }
 
 
 // Called for inline allocation of contexts.
 // Input:
 // EDX: number of context variables.
 // Output:
 // EAX: new allocated RawContext object.
 // EBX and EDX are destroyed.
 void StubCode::GenerateAllocateContextStub(Assembler* assembler) {
+  const Immediate raw_null =
+      Immediate(reinterpret_cast<intptr_t>(Object::null()));
   if (FLAG_inline_alloc) {
     const Class& context_class = Class::ZoneHandle(Object::context_class());
     Label slow_case;
     Heap* heap = Isolate::Current()->heap();
     // First compute the rounded instance size.
     // EDX: number of context variables.
     intptr_t fixed_size = (sizeof(RawContext) + kObjectAlignment - 1);
     __ leal(EBX, Address(EDX, TIMES_4, fixed_size));
     __ andl(EBX, Immediate(-kObjectAlignment));
 
@@ skipping 66 matching lines @@
     }
 
     // Done allocating and initializing the context.
     // EAX: new object.
     __ ret();
 
     __ Bind(&slow_case);
   }
   // Create a stub frame.
   __ EnterFrame(0);
-  const Context& new_context = Context::ZoneHandle();
-  __ PushObject(new_context);  // Push Null context for return value.
+  __ pushl(raw_null);  // Setup space on stack for return value.
   __ SmiTag(EDX);
   __ pushl(EDX);
   __ CallRuntimeFromStub(kAllocateContextRuntimeEntry);  // Allocate context.
   __ popl(EAX);  // Pop number of context variables argument.
   __ popl(EAX);  // Pop the new context object.
   // EAX: new object
   // Restore the frame pointer.
   __ LeaveFrame();
   __ ret();
 }
@@ skipping 159 matching lines @@
     __ ret();
 
     __ Bind(&slow_case);
   }
   if (is_cls_parameterized) {
     __ movl(EAX, Address(ESP, kObjectTypeArgumentsOffset));
     __ movl(EDX, Address(ESP, kInstantiatorTypeArgumentsOffset));
   }
   // Create a stub frame.
   __ EnterFrame(0);
-  const Object& new_object = Object::ZoneHandle();
-  __ PushObject(new_object);  // Push Null object for return value.
+  __ pushl(raw_null);  // Setup space on stack for return value.
   __ PushObject(cls);  // Push class of object to be allocated.
   if (is_cls_parameterized) {
     __ pushl(EAX);  // Push type arguments of object to be allocated.
     __ pushl(EDX);  // Push type arguments of instantiator.
   } else {
     __ pushl(raw_null);  // Push null type arguments.
     __ pushl(raw_null);  // Push null instantiator.
   }
   __ CallRuntimeFromStub(kAllocateObjectRuntimeEntry);  // Allocate object.
   __ popl(EAX);  // Pop argument (instantiator).
@@ skipping 127 matching lines @@
     __ Bind(&slow_case);
   }
   if (has_type_arguments) {
     __ movl(ECX, Address(ESP, kTypeArgumentsOffset));
   }
   if (is_implicit_instance_closure) {
     __ movl(EAX, Address(ESP, kReceiverOffset));
   }
   // Create a stub frame.
   __ EnterFrame(0);
-  const Closure& new_closure = Closure::ZoneHandle();
-  __ PushObject(new_closure);  // Push Null closure for return value.
+  __ pushl(raw_null);  // Setup space on stack for return value.
   __ PushObject(func);
   if (is_implicit_static_closure) {
     __ CallRuntimeFromStub(kAllocateImplicitStaticClosureRuntimeEntry);
   } else {
     if (is_implicit_instance_closure) {
       __ pushl(EAX);  // Receiver.
     }
     if (has_type_arguments) {
       __ pushl(ECX);  // Push type arguments of closure to be allocated.
     } else {
@@ skipping 32 matching lines @@
   // The target function was not found, so invoke method
   // "void noSuchMethod(function_name, Array arguments)".
   // TODO(regis): For now, we simply pass the actual arguments, both positional
   // and named, as the argument array. This is not correct if out-of-order
   // named arguments were passed.
   // The signature of the "noSuchMethod" method has to change from
   // noSuchMethod(String name, Array arguments) to something like
   // noSuchMethod(InvocationMirror call).
   // Also, the class NoSuchMethodException has to be modified accordingly.
   // Total number of args is the first Smi in args descriptor array (EDX).
+  const Immediate raw_null =
+      Immediate(reinterpret_cast<intptr_t>(Object::null()));
   __ movl(EDI, FieldAddress(EDX, Array::data_offset()));
   __ SmiUntag(EDI);
   __ movl(EAX, Address(EBP, EDI, TIMES_4, kWordSize));  // Get receiver.
 
   __ EnterFrame(0);
-  // Setup space for return value on stack by pushing smi 0.
-  __ pushl(Immediate(0));  // Result from noSuchMethod.
+  __ pushl(raw_null);  // Setup space on stack for result from noSuchMethod.
   __ pushl(EAX);  // Receiver.
   __ pushl(ECX);  // IC data array.
   __ pushl(EDX);  // Arguments descriptor array.
   __ subl(EDI, Immediate(1));  // Arguments array length, minus the receiver.
   // See stack layout below explaining "wordSize * 8" offset.
   PushArgumentsArray(assembler, (kWordSize * 8));
 
   // Stack:
   // TOS + 0: Argument array.
   // TOS + 1: Arguments descriptor array.
@@ skipping 97 matching lines @@
     __ addl(EBX, Immediate(kWordSize * (1 + num_args)));  // Next element.
     __ cmpl(EDI, raw_null);   // Done?
     __ j(NOT_EQUAL, &loop, Assembler::kNearJump);
   }
 
   __ Bind(&ic_miss);
   // Get receiver, again.
   __ movl(EAX, FieldAddress(EDX, Array::data_offset()));
   __ leal(EAX, Address(ESP, EAX, TIMES_2, 0));  // EAX is Smi.
   __ EnterFrame(0);
-  // Setup space for return value on stack by pushing smi 0.
   __ pushl(EDX);  // Preserve arguments array.
   __ pushl(ECX);  // Preserve IC data array
-  __ pushl(Immediate(0));  // Space for result (target code object).
+  __ pushl(raw_null);  // Setup space on stack for result (target code object).
   __ movl(EDX, FieldAddress(EDX, Array::data_offset()));
   // Push call arguments.
   for (intptr_t i = 0; i < num_args; i++) {
     __ movl(EDX, Address(EAX, -kWordSize * i));
     __ pushl(EDX);
   }
   if (num_args == 1) {
     __ CallRuntimeFromStub(kInlineCacheMissHandlerOneArgRuntimeEntry);
   } else if (num_args == 2) {
     __ CallRuntimeFromStub(kInlineCacheMissHandlerTwoArgsRuntimeEntry);
@@ skipping 93 matching lines @@
   __ popl(EDX);
   __ popl(ECX);
   __ LeaveFrame();
   // Now call the dynamic function.
   __ jmp(&StubCode::OneArgCheckInlineCacheLabel());
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32