Fix ambiguous method errors by explicitly passing reloc info.

src/arm/codegen-arm.cc

Index: src/arm/codegen-arm.cc
===================================================================
--- src/arm/codegen-arm.cc	(revision 2148)
+++ src/arm/codegen-arm.cc	(working copy)
@@ -1058,7 +1058,7 @@
                                         CALL_JS,
                                         &arg_count_register,
                                         arg_count + 1);
-  __ cmp(result.reg(), Operand(0));
+  __ cmp(result.reg(), Operand(0, RelocInfo::NONE));
   result.Unuse();
   exit.Jump();
 
@@ -1235,7 +1235,7 @@
     } else if (node->fun() != NULL) {
       LoadAndSpill(node->fun());
     } else {
-      __ mov(r0, Operand(0));  // no initial value!
+      __ mov(r0, Operand(0, RelocInfo::NONE));  // no initial value!
       frame_->EmitPush(r0);
     }
     frame_->CallRuntime(Runtime::kDeclareContextSlot, 4);
@@ -1877,7 +1877,7 @@
   frame_->EmitPush(r0);
   Result arg_count = allocator_->Allocate(r0);
   ASSERT(arg_count.is_valid());
-  __ mov(arg_count.reg(), Operand(0));
+  __ mov(arg_count.reg(), Operand(0, RelocInfo::NONE));
   frame_->InvokeBuiltin(Builtins::TO_OBJECT, CALL_JS, &arg_count, 1);
 
   jsobject.Bind();
@@ -3571,7 +3571,8 @@
         frame_->EmitPush(r0);
         Result arg_count = allocator_->Allocate(r0);
         ASSERT(arg_count.is_valid());
-        __ mov(arg_count.reg(), Operand(0));  // not counting receiver
+        // not counting receiver

[William Hesse, 2009/06/15 08:59:29]

// Argument count does not include the receiver.
Comments should be grammatical sentences.  Since you are
moving the comment anyway, let's fix it.

+        __ mov(arg_count.reg(), Operand(0, RelocInfo::NONE));
         frame_->InvokeBuiltin(Builtins::BIT_NOT, CALL_JS, &arg_count, 1);
 
         continue_label.Jump();
@@ -3596,7 +3597,8 @@
         frame_->EmitPush(r0);
         Result arg_count = allocator_->Allocate(r0);
         ASSERT(arg_count.is_valid());
-        __ mov(arg_count.reg(), Operand(0));  // not counting receiver
+        // not counting receiver
+        __ mov(arg_count.reg(), Operand(0, RelocInfo::NONE));
         frame_->InvokeBuiltin(Builtins::TO_NUMBER, CALL_JS, &arg_count, 1);
         continue_label.Bind();
         break;
@@ -3626,7 +3628,7 @@
 
   // Postfix: Make room for the result.
   if (is_postfix) {
-     __ mov(r0, Operand(0));
+     __ mov(r0, Operand(0, RelocInfo::NONE));
      frame_->EmitPush(r0);
   }
 
@@ -3683,7 +3685,7 @@
       frame_->EmitPush(r0);
       Result arg_count = allocator_->Allocate(r0);
       ASSERT(arg_count.is_valid());
-      __ mov(arg_count.reg(), Operand(0));
+      __ mov(arg_count.reg(), Operand(0, RelocInfo::NONE));
       frame_->InvokeBuiltin(Builtins::TO_NUMBER, CALL_JS, &arg_count, 1);
     }
     if (is_postfix) {
@@ -4331,7 +4333,7 @@
 #ifdef __ARM_ARCH_5__
   __ clz(zeros, source);  // This instruction is only supported after ARM5.
 #else
-  __ mov(zeros, Operand(0));
+  __ mov(zeros, Operand(0, RelocInfo::NONE));
   __ mov(scratch, source);
   // Top 16.
   __ tst(scratch, Operand(0xffff0000));
@@ -4418,18 +4420,18 @@
   ASSERT(HeapNumber::kSignMask == 0x80000000u);
   __ and_(exponent, source_, Operand(HeapNumber::kSignMask), SetCC);
   // Subtract from 0 if source was negative.
-  __ rsb(source_, source_, Operand(0), LeaveCC, ne);
+  __ rsb(source_, source_, Operand(0, RelocInfo::NONE), LeaveCC, ne);
   __ cmp(source_, Operand(1));
   __ b(gt, &not_special);
 
   // We have -1, 0 or 1, which we treat specially.
-  __ cmp(source_, Operand(0));
+  __ cmp(source_, Operand(0, RelocInfo::NONE));
   // For 1 or -1 we need to or in the 0 exponent (biased to 1023).
   static const uint32_t exponent_word_for_1 =
       HeapNumber::kExponentBias << HeapNumber::kExponentShift;
   __ orr(exponent, exponent, Operand(exponent_word_for_1), LeaveCC, ne);
   // 1, 0 and -1 all have 0 for the second word.
-  __ mov(mantissa, Operand(0));
+  __ mov(mantissa, Operand(0, RelocInfo::NONE));
   __ Ret();
 
   __ bind(&not_special);
@@ -4512,7 +4514,7 @@
   // Set the sign bit in scratch_ if the value was negative.
   __ orr(scratch_, scratch_, Operand(HeapNumber::kSignMask), LeaveCC, cs);
   // Subtract from 0 if the value was negative.
-  __ rsb(the_int_, the_int_, Operand(0), LeaveCC, cs);
+  __ rsb(the_int_, the_int_, Operand(0, RelocInfo::NONE), LeaveCC, cs);
   // We should be masking the implict first digit of the mantissa away here,
   // but it just ends up combining harmlessly with the last digit of the
   // exponent that happens to be 1.  The sign bit is 0 so we shift 10 to get
@@ -4535,7 +4537,7 @@
   non_smi_exponent += 1 << HeapNumber::kExponentShift;
   __ mov(ip, Operand(HeapNumber::kSignMask | non_smi_exponent));
   __ str(ip, FieldMemOperand(the_heap_number_, HeapNumber::kExponentOffset));
-  __ mov(ip, Operand(0));
+  __ mov(ip, Operand(0, RelocInfo::NONE));
   __ str(ip, FieldMemOperand(the_heap_number_, HeapNumber::kMantissaOffset));
   __ Ret();
 }
@@ -4741,7 +4743,7 @@
   // Shift down 22 bits to get the last 10 bits.
   __ orr(dest, scratch2, Operand(scratch, LSR, 32 - shift_distance));
   // Fix sign if sign bit was set.
-  __ rsb(dest, dest, Operand(0), LeaveCC, ne);
+  __ rsb(dest, dest, Operand(0, RelocInfo::NONE), LeaveCC, ne);
 }
 
 
@@ -5052,12 +5054,12 @@
 
   // Enter runtime system if the value of the expression is zero
   // to make sure that we switch between 0 and -0.
-  __ cmp(r0, Operand(0));
+  __ cmp(r0, Operand(0, RelocInfo::NONE));
   __ b(eq, &slow);
 
   // The value of the expression is a smi that is not zero.  Try
   // optimistic subtraction '0 - value'.
-  __ rsb(r1, r0, Operand(0), SetCC);
+  __ rsb(r1, r0, Operand(0, RelocInfo::NONE), SetCC);
   __ b(vs, &slow);
 
   __ mov(r0, Operand(r1));  // Set r0 to result.
@@ -5066,7 +5068,7 @@
   // Enter runtime system.
   __ bind(&slow);
   __ push(r0);
-  __ mov(r0, Operand(0));  // Set number of arguments.
+  __ mov(r0, Operand(0, RelocInfo::NONE));  // Set number of arguments.
   __ InvokeBuiltin(Builtins::UNARY_MINUS, JUMP_JS);
 
   __ bind(&done);
@@ -5113,9 +5115,9 @@
   // Before returning we restore the context from the frame pointer if
   // not NULL.  The frame pointer is NULL in the exception handler of a
   // JS entry frame.
-  __ cmp(fp, Operand(0));
+  __ cmp(fp, Operand(0, RelocInfo::NONE));
   // Set cp to NULL if fp is NULL.
-  __ mov(cp, Operand(0), LeaveCC, eq);
+  __ mov(cp, Operand(0, RelocInfo::NONE), LeaveCC, eq);
   // Restore cp otherwise.
   __ ldr(cp, MemOperand(fp, StandardFrameConstants::kContextOffset), ne);
 #ifdef DEBUG
@@ -5157,7 +5159,7 @@
 
   // Set external caught exception to false.
   ExternalReference external_caught(Top::k_external_caught_exception_address);
-  __ mov(r0, Operand(false));
+  __ mov(r0, Operand(0, RelocInfo::NONE));
   __ mov(r2, Operand(external_caught));
   __ str(r0, MemOperand(r2));
 
@@ -5178,9 +5180,9 @@
   // Before returning we restore the context from the frame pointer if
   // not NULL.  The frame pointer is NULL in the exception handler of a
   // JS entry frame.
-  __ cmp(fp, Operand(0));
+  __ cmp(fp, Operand(0, RelocInfo::NONE));
   // Set cp to NULL if fp is NULL.
-  __ mov(cp, Operand(0), LeaveCC, eq);
+  __ mov(cp, Operand(0, RelocInfo::NONE), LeaveCC, eq);
   // Restore cp otherwise.
   __ ldr(cp, MemOperand(fp, StandardFrameConstants::kContextOffset), ne);
 #ifdef DEBUG
@@ -5650,7 +5652,7 @@
   // Slow-case: Non-function called.
   __ bind(&slow);
   __ mov(r0, Operand(argc_));  // Setup the number of arguments.
-  __ mov(r2, Operand(0));
+  __ mov(r2, Operand(0, RelocInfo::NONE));
   __ GetBuiltinEntry(r3, Builtins::CALL_NON_FUNCTION);
   __ Jump(Handle<Code>(Builtins::builtin(Builtins::ArgumentsAdaptorTrampoline)),
           RelocInfo::CODE_TARGET);