Fixed remaining bugs in COW-regexp-results.

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 5272 matching lines @@
     // the unmodified JSRegExpResult map is returned unmodified.
     // This also ensures that elements are fast.
 
     __ ldr(r1, ContextOperand(cp, Context::GLOBAL_INDEX));
     __ ldr(r1, FieldMemOperand(r1, GlobalObject::kGlobalContextOffset));
     __ ldr(r1, ContextOperand(r1, Context::REGEXP_RESULT_MAP_INDEX));
     __ ldr(ip, FieldMemOperand(r0, HeapObject::kMapOffset));
     __ cmp(r1, Operand(ip));
     __ b(ne, &done);
 
+    if (FLAG_debug_code) {
+      __ LoadRoot(r2, Heap::kEmptyFixedArrayRootIndex);
+      __ ldr(ip, FieldMemOperand(r0, JSObject::kPropertiesOffset));
+      __ cmp(ip, r2);
+      __ Check(eq, "JSRegExpResult: default map but non-empty properties.");
+    }
+
     // All set, copy the contents to a new object.
     __ AllocateInNewSpace(JSRegExpResult::kSize,
                           r2,
                           r3,
                           r4,
                           &call_runtime,
                           NO_ALLOCATION_FLAGS);
     // Store RegExpResult map as map of allocated object.
     ASSERT(JSRegExpResult::kSize == 6 * kPointerSize);
     // Copy all fields (map is already in r1) from (untagged) r0 to r2.
     // Change map of elements array (ends up in r4) to be a FixedCOWArray.
     __ bic(r0, r0, Operand(kHeapObjectTagMask));
     __ ldm(ib, r0, r3.bit() | r4.bit() | r5.bit() | r6.bit() | r7.bit());
     __ stm(ia, r2,
            r1.bit() | r3.bit() | r4.bit() | r5.bit() | r6.bit() | r7.bit());
-    ASSERT(!Heap::InNewSpace(Heap::fixed_cow_array_map()));
     ASSERT(JSRegExp::kElementsOffset == 2 * kPointerSize);
     // Check whether elements array is empty fixed array, and otherwise make
     // it copy-on-write (it never should be empty unless someone is messing
     // with the arguments to the runtime function).
     __ LoadRoot(ip, Heap::kEmptyFixedArrayRootIndex);
     __ add(r0, r2, Operand(kHeapObjectTag));  // Tag result and move it to r0.
     __ cmp(r4, ip);
     __ b(eq, &done);
     __ LoadRoot(ip, Heap::kFixedCOWArrayMapRootIndex);
     __ str(ip, FieldMemOperand(r4, HeapObject::kMapOffset));
@@ skipping 6442 matching lines @@
   __ bind(&string_add_runtime);
   __ TailCallRuntime(Runtime::kStringAdd, 2, 1);
 }
 
 
 #undef __
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_ARM