A64: Synchronize with r16024.

src/a64/builtins-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 96 matching lines @@
   ASM_LOCATION("Builtins::Generate_InternalArrayCode");
   Label generic_array_code;
 
   // Get the InternalArray function.
   GenerateLoadInternalArrayFunction(masm, x1);
 
   if (FLAG_debug_code) {
     // Initial map for the builtin InternalArray functions should be maps.
     __ Ldr(x10, FieldMemOperand(x1, JSFunction::kPrototypeOrInitialMapOffset));
     __ Tst(x10, kSmiTagMask);
-    __ Assert(ne, "Unexpected initial map for InternalArray function");
+    __ Assert(ne, kUnexpectedInitialMapForInternalArrayFunction);
     __ CompareObjectType(x10, x11, x12, MAP_TYPE);
-    __ Assert(eq, "Unexpected initial map for InternalArray function");
+    __ Assert(eq, kUnexpectedInitialMapForInternalArrayFunction);
   }
 
   // Run the native code for the InternalArray function called as a normal
   // function.
   InternalArrayConstructorStub stub(masm->isolate());
   __ TailCallStub(&stub);
 }
 
 
 void Builtins::Generate_ArrayCode(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- x0     : number of arguments
   //  -- lr     : return address
   //  -- sp[...]: constructor arguments
   // -----------------------------------
   ASM_LOCATION("Builtins::Generate_ArrayCode");
   Label generic_array_code, one_or_more_arguments, two_or_more_arguments;
 
   // Get the Array function.
   GenerateLoadArrayFunction(masm, x1);
 
   if (FLAG_debug_code) {
     // Initial map for the builtin Array functions should be maps.
     __ Ldr(x10, FieldMemOperand(x1, JSFunction::kPrototypeOrInitialMapOffset));
     __ Tst(x10, kSmiTagMask);
-    __ Assert(ne, "Unexpected initial map for Array function");
+    __ Assert(ne, kUnexpectedInitialMapForArrayFunction);
     __ CompareObjectType(x10, x11, x12, MAP_TYPE);
-    __ Assert(eq, "Unexpected initial map for Array function");
+    __ Assert(eq, kUnexpectedInitialMapForArrayFunction);
   }
 
   // Run the native code for the Array function called as a normal function.
   Handle<Object> undefined_sentinel(
       masm->isolate()->heap()->undefined_value(),
       masm->isolate());
   __ Mov(x2, Operand(undefined_sentinel));
   ArrayConstructorStub stub(masm->isolate());
   __ TailCallStub(&stub);
 }
 
 
 void Builtins::Generate_StringConstructCode(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- x0                     : number of arguments
   //  -- x1                     : constructor function
   //  -- lr                     : return address
   //  -- sp[(argc - n - 1) * 8] : arg[n] (zero based)
   //  -- sp[argc * 8]           : receiver
   // -----------------------------------
   ASM_LOCATION("Builtins::Generate_StringConstructCode");
   Counters* counters = masm->isolate()->counters();
   __ IncrementCounter(counters->string_ctor_calls(), 1, x10, x11);
 
   Register argc = x0;
   Register function = x1;
   if (FLAG_debug_code) {
     __ LoadGlobalFunction(Context::STRING_FUNCTION_INDEX, x10);
     __ Cmp(function, x10);
-    __ Assert(eq, "Unexpected String function");
+    __ Assert(eq, kUnexpectedStringFunction);
   }
 
   // Load the first arguments in x0 and get rid of the rest.
   Label no_arguments;
   __ Cbz(argc, &no_arguments);
   // First args = sp[(argc - 1) * 8].
   __ Sub(argc, argc, 1);
   __ Claim(argc, kXRegSizeInBytes);
   // jssp now point to args[0], load and drop args[0] + receiver.
   // TODO(jbramley): Consider adding ClaimAndPoke.
@@ skipping 21 matching lines @@
   Label gc_required;
   Register new_obj = x0;
   __ Allocate(JSValue::kSize, new_obj, x10, x11, &gc_required, TAG_OBJECT);
 
   // Initialize the String object.
   Register map = x3;
   __ LoadGlobalFunctionInitialMap(function, map, x10);
   if (FLAG_debug_code) {
     __ Ldrb(x4, FieldMemOperand(map, Map::kInstanceSizeOffset));
     __ Cmp(x4, JSValue::kSize >> kPointerSizeLog2);
-    __ Assert(eq, "Unexpected string wrapper instance size");
+    __ Assert(eq, kUnexpectedStringWrapperInstanceSize);
     __ Ldrb(x4, FieldMemOperand(map, Map::kUnusedPropertyFieldsOffset));
     __ Cmp(x4, 0);
-    __ Assert(eq, "Unexpected unused properties of string wrapper");
+    __ Assert(eq, kUnexpectedUnusedPropertiesOfStringWrapper);
   }
   __ Str(map, FieldMemOperand(new_obj, HeapObject::kMapOffset));
 
   Register empty = x3;
   __ LoadRoot(empty, Heap::kEmptyFixedArrayRootIndex);
   __ Str(empty, FieldMemOperand(new_obj, JSObject::kPropertiesOffset));
   __ Str(empty, FieldMemOperand(new_obj, JSObject::kElementsOffset));
 
   __ Str(argument, FieldMemOperand(new_obj, JSValue::kValueOffset));
 
@@ skipping 221 matching lines @@
 
       if (count_constructions) {
         // Register first_non_prealloc is the offset of the first field after
         // pre-allocated fields.
         Register first_non_prealloc = x12;
         __ Add(first_non_prealloc, first_prop,
                Operand(prealloc_fields, LSL, kPointerSizeLog2));
 
         if (FLAG_debug_code) {
           __ Cmp(first_non_prealloc, obj_end);
-          __ Assert(le, "Unexpected number of pre-allocated property fields");
+          __ Assert(le, kUnexpectedNumberOfPreAllocatedPropertyFields);
         }
         __ InitializeFieldsWithFiller(first_prop, first_non_prealloc, undef);
         // To allow for truncation.
         __ LoadRoot(x12, Heap::kOnePointerFillerMapRootIndex);
         __ InitializeFieldsWithFiller(first_prop, obj_end, x12);
       } else {
         __ InitializeFieldsWithFiller(first_prop, obj_end, undef);
       }
 
       // Add the object tag to make the JSObject real, so that we can continue
       // and jump into the continuation code at any time from now on. Any
       // failures need to undo the allocation, so that the heap is in a
       // consistent state and verifiable.
       __ Add(new_obj, new_obj, kHeapObjectTag);
 
       // Check if a non-empty properties array is needed. Continue with
       // allocated object if not, or fall through to runtime call if it is.
       Register element_count = x3;
       __ Ldrb(x3, FieldMemOperand(init_map, Map::kUnusedPropertyFieldsOffset));
       // The field instance sizes contains both pre-allocated property fields
       // and in-object properties.
       __ Add(x3, x3, prealloc_fields);
       __ Subs(element_count, x3, inobject_props);
 
       // Done if no extra properties are to be allocated.
       __ B(eq, &allocated);
-      __ Assert(pl, "Property allocation count failed");
+      __ Assert(pl, kPropertyAllocationCountFailed);
 
       // Scale the number of elements by pointer size and add the header for
       // FixedArrays to the start of the next object calculation from above.
       Register new_array = x5;
       Register array_size = x6;
       __ Add(array_size, element_count, FixedArray::kHeaderSize / kPointerSize);
       __ Allocate(array_size, new_array, x11, x12, &undo_allocation,
                   static_cast<AllocationFlags>(RESULT_CONTAINS_TOP |
                                                SIZE_IN_WORDS));
 
@@ skipping 391 matching lines @@
   __ Ret();
 
   __ Bind(&with_tos_register);
   // Reload TOS register.
   __ Peek(x0, kPointerSize);
   __ CompareAndBranch(state, FullCodeGenerator::TOS_REG, ne, &unknown_state);
   __ Drop(2);  // Remove state and TOS.
   __ Ret();
 
   __ Bind(&unknown_state);
-  __ Abort("Invalid fullcodegen state.");
+  __ Abort(kInvalidFullCodegenState);
 }
 
 
 void Builtins::Generate_NotifyDeoptimized(MacroAssembler* masm) {
   Generate_NotifyDeoptimizedHelper(masm, Deoptimizer::EAGER);
 }
 
 
 void Builtins::Generate_NotifyLazyDeoptimized(MacroAssembler* masm) {
   Generate_NotifyDeoptimizedHelper(masm, Deoptimizer::LAZY);
@@ skipping 278 matching lines @@
     __ Sub(x10, jssp, x10);
     // Check if the arguments will overflow the stack.
     __ Cmp(x10, Operand(argc, LSR, kSmiShift - kPointerSizeLog2));
     __ B(gt, &enough_stack_space);
     // There is not enough stack space, so use a builtin to throw an appropriate
     // error.
     __ Push(function, argc);
     __ InvokeBuiltin(Builtins::APPLY_OVERFLOW, CALL_FUNCTION);
     // We should never return from the APPLY_OVERFLOW builtin.
     if (__ emit_debug_code()) {
-      __ Abort("Unreachable code.");
+      __ Unreachable();
     }
 
     __ Bind(&enough_stack_space);
     // Push current limit and index.
     __ Mov(x1, 0);  // Initial index.
     __ Push(argc, x1);
 
     Label push_receiver;
     __ Ldr(receiver, MemOperand(fp, kReceiverOffset));
 
@@ skipping 244 matching lines @@
   __ Bind(&dont_adapt_arguments);
   __ Jump(x3);
 }
 
 
 #undef __
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_ARM