[Isolates] Merge from bleeding_edge to isolates, revisions 6100-6300.

src/arm/builtins-arm.cc

 // Copyright 2010 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 486 matching lines @@
 
   Register function = r1;
   if (FLAG_debug_code) {
     __ LoadGlobalFunction(Context::STRING_FUNCTION_INDEX, r2);
     __ cmp(function, Operand(r2));
     __ Assert(eq, "Unexpected String function");
   }
 
   // Load the first arguments in r0 and get rid of the rest.
   Label no_arguments;
-  __ cmp(r0, Operand(0));
+  __ cmp(r0, Operand(0, RelocInfo::NONE));
   __ b(eq, &no_arguments);
   // First args = sp[(argc - 1) * 4].
   __ sub(r0, r0, Operand(1));
   __ ldr(r0, MemOperand(sp, r0, LSL, kPointerSizeLog2, PreIndex));
   // sp now point to args[0], drop args[0] + receiver.
   __ Drop(2);
 
   Register argument = r2;
   Label not_cached, argument_is_string;
   NumberToStringStub::GenerateLookupNumberStringCache(
@@ skipping 23 matching lines @@
                         TAG_OBJECT);
 
   // Initialising the String Object.
   Register map = r3;
   __ LoadGlobalFunctionInitialMap(function, map, r4);
   if (FLAG_debug_code) {
     __ ldrb(r4, FieldMemOperand(map, Map::kInstanceSizeOffset));
     __ cmp(r4, Operand(JSValue::kSize >> kPointerSizeLog2));
     __ Assert(eq, "Unexpected string wrapper instance size");
     __ ldrb(r4, FieldMemOperand(map, Map::kUnusedPropertyFieldsOffset));
-    __ cmp(r4, Operand(0));
+    __ cmp(r4, Operand(0, RelocInfo::NONE));
     __ Assert(eq, "Unexpected unused properties of string wrapper");
   }
   __ str(map, FieldMemOperand(r0, HeapObject::kMapOffset));
 
   __ LoadRoot(r3, Heap::kEmptyFixedArrayRootIndex);
   __ str(r3, FieldMemOperand(r0, JSObject::kPropertiesOffset));
   __ str(r3, FieldMemOperand(r0, JSObject::kElementsOffset));
 
   __ str(argument, FieldMemOperand(r0, JSValue::kValueOffset));
 
@@ skipping 1006 matching lines @@
   __ bind(&dont_adapt_arguments);
   __ Jump(r3);
 }
 
 
 #undef __
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_ARM