ARM: Fix another bug in r5252...

src/arm/codegen-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 4815 matching lines @@
            Operand(scratch2_, LSL, kPointerSizeLog2 - kSmiTagSize));
 
     // Calculate location of the first key name.
     __ add(map_result_,
            map_result_,
            Operand(FixedArray::kHeaderSize - kHeapObjectTag +
                    DescriptorArray::kFirstIndex * kPointerSize));
     // Loop through all the keys in the descriptor array. If one of these is the
     // symbol valueOf the result is false.
     Label entry, loop;
+    // The use of ip to store the valueOf symbol asumes that it is not otherwise

[Erik Corry, 2010/08/13 12:36:22]

asumes -> assumes

+    // used in the loop below.
+    __ mov(ip, Operand(Factory::value_of_symbol()));
     __ jmp(&entry);
     __ bind(&loop);
-    __ ldr(scratch2_, FieldMemOperand(map_result_, 0));
-    __ cmp(scratch2_, Operand(Factory::value_of_symbol()));
+    __ ldr(scratch2_, MemOperand(map_result_, 0));
+    __ cmp(scratch2_, ip);
     __ b(eq, &false_result);
     __ add(map_result_, map_result_, Operand(kPointerSize));
     __ bind(&entry);
     __ cmp(map_result_, Operand(scratch1_));
     __ b(ne, &loop);
 
     // Reload map as register map_result_ was used as temporary above.
     __ ldr(map_result_, FieldMemOperand(object_, HeapObject::kMapOffset));
 
     // If a valueOf property is not found on the object check that it's
@@ skipping 6713 matching lines @@
   __ bind(&string_add_runtime);
   __ TailCallRuntime(Runtime::kStringAdd, 2, 1);
 }
 
 
 #undef __
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_ARM