Revert commit 2701 per Erik Corry's request.

src/arm/stub-cache-arm.cc

 // Copyright 2006-2009 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 377 matching lines @@
       Object* probe = global->EnsurePropertyCell(name);
       if (probe->IsFailure()) {
         set_failure(Failure::cast(probe));
         return result;
       }
       JSGlobalPropertyCell* cell = JSGlobalPropertyCell::cast(probe);
       ASSERT(cell->value()->IsTheHole());
       __ mov(scratch, Operand(Handle<Object>(cell)));
       __ ldr(scratch,
              FieldMemOperand(scratch, JSGlobalPropertyCell::kValueOffset));
-      __ LoadRoot(ip, Heap::kTheHoleValueRootIndex);
-      __ cmp(scratch, ip);
+      __ cmp(scratch, Operand(Factory::the_hole_value()));
       __ b(ne, miss);
     }
     object = JSObject::cast(object->GetPrototype());
   }
 
   // Return the register containin the holder.
   return result;
 }
 
 
@@ skipping 251 matching lines @@
                                           Context::NUMBER_FUNCTION_INDEX,
                                           r2);
       CheckPrototypes(JSObject::cast(object->GetPrototype()), r2, holder, r3,
                       r1, name, &miss);
       break;
     }
 
     case BOOLEAN_CHECK: {
       Label fast;
       // Check that the object is a boolean.
-      __ LoadRoot(ip, Heap::kTrueValueRootIndex);
-      __ cmp(r1, ip);
+      __ cmp(r1, Operand(Factory::true_value()));
       __ b(eq, &fast);
-      __ LoadRoot(ip, Heap::kFalseValueRootIndex);
-      __ cmp(r1, ip);
+      __ cmp(r1, Operand(Factory::false_value()));
       __ b(ne, &miss);
       __ bind(&fast);
       // Check that the maps starting from the prototype haven't changed.
       GenerateLoadGlobalFunctionPrototype(masm(),
                                           Context::BOOLEAN_FUNCTION_INDEX,
                                           r2);
       CheckPrototypes(JSObject::cast(object->GetPrototype()), r2, holder, r3,
                       r1, name, &miss);
       break;
     }
 
     case JSARRAY_HAS_FAST_ELEMENTS_CHECK:
       CheckPrototypes(JSObject::cast(object), r1, holder, r3, r2, name, &miss);
       // Make sure object->HasFastElements().
       // Get the elements array of the object.
       __ ldr(r3, FieldMemOperand(r1, JSObject::kElementsOffset));
       // Check that the object is in fast mode (not dictionary).
       __ ldr(r2, FieldMemOperand(r3, HeapObject::kMapOffset));
-      __ LoadRoot(ip, Heap::kFixedArrayMapRootIndex);
-      __ cmp(r2, ip);
+      __ cmp(r2, Operand(Factory::fixed_array_map()));
       __ b(ne, &miss);
       break;
 
     default:
       UNREACHABLE();
   }
 
   // Get the function and setup the context.
   __ mov(r1, Operand(Handle<JSFunction>(function)));
   __ ldr(cp, FieldMemOperand(r1, JSFunction::kContextOffset));
@@ skipping 399 matching lines @@
 
   // Check that the map of the global has not changed.
   CheckPrototypes(object, r1, holder, r3, r0, name, &miss);
 
   // Get the value from the cell.
   __ mov(r3, Operand(Handle<JSGlobalPropertyCell>(cell)));
   __ ldr(r0, FieldMemOperand(r3, JSGlobalPropertyCell::kValueOffset));
 
   // Check for deleted property if property can actually be deleted.
   if (!is_dont_delete) {
-    __ LoadRoot(ip, Heap::kTheHoleValueRootIndex);
-    __ cmp(r0, ip);
+    __ cmp(r0, Operand(Factory::the_hole_value()));
     __ b(eq, &miss);
   }
 
   __ IncrementCounter(&Counters::named_load_global_inline, 1, r1, r3);
   __ Ret();
 
   __ bind(&miss);
   __ IncrementCounter(&Counters::named_load_global_inline_miss, 1, r1, r3);
   GenerateLoadMiss(masm(), Code::LOAD_IC);
 
@@ skipping 211 matching lines @@
   __ Jump(ic, RelocInfo::CODE_TARGET);
 
   // Return the generated code.
   return GetCode(transition == NULL ? FIELD : MAP_TRANSITION, name);
 }
 
 
 #undef __
 
 } }  // namespace v8::internal