A64: Synchronize with r16756.

src/a64/full-codegen-a64.cc

 // Copyright 2013 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 2729 matching lines @@
   context()->Plug(if_true, if_false);
 }
 
 
 void FullCodeGenerator::EmitIsStringWrapperSafeForDefaultValueOf(
     CallRuntime* expr) {
   ZoneList<Expression*>* args = expr->arguments();
   ASSERT(args->length() == 1);
   VisitForAccumulatorValue(args->at(0));
 
-  Label materialize_true, materialize_false;
+  Label materialize_true, materialize_false, skip_lookup;
   Label* if_true = NULL;
   Label* if_false = NULL;
   Label* fall_through = NULL;
   context()->PrepareTest(&materialize_true, &materialize_false,
                          &if_true, &if_false, &fall_through);
 
   Register object = x0;
   __ AssertNotSmi(object);
 
   Register map = x10;
   Register bitfield2 = x11;
   __ Ldr(map, FieldMemOperand(object, HeapObject::kMapOffset));
   __ Ldrb(bitfield2, FieldMemOperand(map, Map::kBitField2Offset));
-  __ Tbnz(bitfield2, Map::kStringWrapperSafeForDefaultValueOf, if_true);
+  __ Tbnz(bitfield2, Map::kStringWrapperSafeForDefaultValueOf, &skip_lookup);
 
   // Check for fast case object. Generate false result for slow case object.
   Register props = x12;
   Register props_map = x12;
   Register hash_table_map = x13;
   __ Ldr(props, FieldMemOperand(object, JSObject::kPropertiesOffset));
   __ Ldr(props_map, FieldMemOperand(props, HeapObject::kMapOffset));
   __ LoadRoot(hash_table_map, Heap::kHashTableMapRootIndex);
   __ Cmp(props_map, hash_table_map);
   __ B(eq, if_false);
@@ skipping 31 matching lines @@
   __ Bind(&loop);
   __ Ldr(x15, MemOperand(descriptors));
   __ Cmp(x15, valueof_string);
   __ B(eq, if_false);
   __ Add(descriptors, descriptors,
          DescriptorArray::kDescriptorSize * kPointerSize);
   __ Cmp(descriptors, descriptors_end);
   __ B(ne, &loop);
 
   __ Bind(&done);
+
+  // Set the bit in the map to indicate that there is no local valueOf field.
+  __ Ldrb(x2, FieldMemOperand(map, Map::kBitField2Offset));
+  __ Orr(x2, x2, 1 << Map::kStringWrapperSafeForDefaultValueOf);
+  __ Strb(x2, FieldMemOperand(map, Map::kBitField2Offset));
+
+  __ Bind(&skip_lookup);
+
   // If a valueOf property is not found on the object check that its prototype
   // is the unmodified String prototype. If not result is false.
   Register prototype = x1;
   Register global_idx = x2;
   Register native_context = x2;
   Register string_proto = x3;
   Register proto_map = x4;
   __ Ldr(prototype, FieldMemOperand(map, Map::kPrototypeOffset));
   __ JumpIfSmi(prototype, if_false);
   __ Ldr(proto_map, FieldMemOperand(prototype, HeapObject::kMapOffset));
   __ Ldr(global_idx, GlobalObjectMemOperand());
   __ Ldr(native_context,
          FieldMemOperand(global_idx, GlobalObject::kNativeContextOffset));
   __ Ldr(string_proto,
          ContextMemOperand(native_context,
                            Context::STRING_FUNCTION_PROTOTYPE_MAP_INDEX));
   __ Cmp(proto_map, string_proto);
-  __ B(ne, if_false);
-
-  __ B(if_true);
 
   PrepareForBailoutBeforeSplit(expr, true, if_true, if_false);
+  Split(eq, if_true, if_false, fall_through);
+
   context()->Plug(if_true, if_false);
 }
 
 
 void FullCodeGenerator::EmitIsFunction(CallRuntime* expr) {
   ZoneList<Expression*>* args = expr->arguments();
   ASSERT(args->length() == 1);
 
   VisitForAccumulatorValue(args->at(0));
 
@@ skipping 2116 matching lines @@
   return previous_;
 }
 
 
 #undef __
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_A64