A64: Fix NumberTagI for cases calling runtime

src/a64/lithium-codegen-a64.cc

 // Copyright 2013 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 3979 matching lines @@
   __ Str(input, FieldMemOperand(result, HeapNumber::kValueOffset));
   __ Bind(&done);
 }
 
 
 void LCodeGen::DoDeferredNumberTagI(LInstruction* instr,
                                     LOperand* value,
                                     LOperand* temp1,
                                     LOperand* temp2,
                                     IntegerSignedness signedness) {
-  Label slow;
+  Label slow, convert_and_store;
   Register src = ToRegister32(value);
   Register dst = ToRegister(instr->result());
-  DoubleRegister dbl_scratch = double_scratch();
+  Register scratch1 = ToRegister(temp1);
 
-  Label done;
-  if (signedness == SIGNED_INT32) {
-    ASM_UNIMPLEMENTED_BREAK("DeferredNumberTagI - signed int32 case.");
-  } else {
-    ASSERT(signedness == UNSIGNED_INT32);
-    __ Ucvtf(dbl_scratch, src);
-  }
-
-  Register scratch1 = ToRegister(temp1);
   if (FLAG_inline_new) {
     Register scratch2 = ToRegister(temp2);
     __ AllocateHeapNumber(dst, &slow, scratch1, scratch2);
-    __ B(&done);
+    __ B(&convert_and_store);
   }
 
   // Slow case: call the runtime system to do the number allocation.
   __ Bind(&slow);
 
   // Check that the dst register contains new space allocation top, which is a
   // valid address for the GC.
   if (FLAG_debug_code) {
     ExternalReference new_space_allocation_top =
         ExternalReference::new_space_allocation_top_address(isolate());
     __ Mov(scratch1, Operand(new_space_allocation_top));
     __ Ldr(scratch1, MemOperand(scratch1));
     __ Cmp(dst, scratch1);
     __ Check(eq, "Register dst does not contain allocation top.");
   }
 
   {
     // Preserve the value of all registers.
     PushSafepointRegistersScope scope(this, Safepoint::kWithRegisters);
 
     CallRuntimeFromDeferred(Runtime::kAllocateHeapNumber, 0, instr);
     __ StoreToSafepointRegisterSlot(x0, dst);
   }
 
-  // Done. Move converted value in dbl_scratch into the newly allocated heap
+  // Convert number to floating point and store in the newly allocated heap
   // number.
-  __ Bind(&done);
+  __ Bind(&convert_and_store);
+  DoubleRegister dbl_scratch = double_scratch();
+  if (signedness == SIGNED_INT32) {
+    ASM_UNIMPLEMENTED_BREAK("DeferredNumberTagI - signed int32 case.");
+  } else {
+    ASSERT(signedness == UNSIGNED_INT32);
+    __ Ucvtf(dbl_scratch, src);
+  }
   __ Str(dbl_scratch, FieldMemOperand(dst, HeapNumber::kValueOffset));
 }
 
 
 void LCodeGen::DoNumberTagU(LNumberTagU* instr) {
   class DeferredNumberTagU: public LDeferredCode {
    public:
     DeferredNumberTagU(LCodeGen* codegen, LNumberTagU* instr)
         : LDeferredCode(codegen), instr_(instr) { }
     virtual void Generate() {
@@ skipping 1216 matching lines @@
   __ Bind(&out_of_object);
   __ Ldr(result, FieldMemOperand(object, JSObject::kPropertiesOffset));
   // Index is equal to negated out of object property index plus 1.
   __ Sub(result, result, Operand::UntagSmiAndScale(index, kPointerSizeLog2));
   __ Ldr(result, FieldMemOperand(result,
                                  FixedArray::kHeaderSize - kPointerSize));
   __ Bind(&done);
 }
 
 } }  // namespace v8::internal