A64: Synchronize with r15204.

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 111 matching lines @@
 //   - fp: our caller's frame pointer.
 //   - jssp: stack pointer.
 //   - lr: return address.
 //
 // The function builds a JS frame. See JavaScriptFrameConstants in
 // frames-arm.h for its layout.
 void FullCodeGenerator::Generate() {
   CompilationInfo* info = info_;
   handler_table_ =
       isolate()->factory()->NewFixedArray(function()->handler_count(), TENURED);
-  profiling_counter_ = isolate()->factory()->NewJSGlobalPropertyCell(
+  profiling_counter_ = isolate()->factory()->NewCell(
       Handle<Smi>(Smi::FromInt(FLAG_interrupt_budget), isolate()));
   SetFunctionPosition(function());
   Comment cmnt(masm_, "[ Function compiled by full code generator");
 
   ProfileEntryHookStub::MaybeCallEntryHook(masm_);
 
 #ifdef DEBUG
   if (strlen(FLAG_stop_at) > 0 &&
       info->function()->name()->IsUtf8EqualTo(CStrVector(FLAG_stop_at))) {
     __ Debug("stop-at", __LINE__, BREAK);
@@ skipping 173 matching lines @@
 
 
 void FullCodeGenerator::ClearAccumulator() {
   __ Mov(x0, Operand(Smi::FromInt(0)));
 }
 
 
 // TODO(mcapewel): untested, ported as part of merge.
 void FullCodeGenerator::EmitProfilingCounterDecrement(int delta) {
   __ Mov(x2, Operand(profiling_counter_));
-  __ Ldr(x3, FieldMemOperand(x2, JSGlobalPropertyCell::kValueOffset));
+  __ Ldr(x3, FieldMemOperand(x2, Cell::kValueOffset));
   __ Subs(x3, x3, Operand(Smi::FromInt(delta)));
-  __ Str(x3, FieldMemOperand(x2, JSGlobalPropertyCell::kValueOffset));
+  __ Str(x3, FieldMemOperand(x2, Cell::kValueOffset));
 }
 
 
 // TODO(mcapewel): untested, ported as part of merge.
 void FullCodeGenerator::EmitProfilingCounterReset() {
   int reset_value = FLAG_interrupt_budget;
   if (info_->ShouldSelfOptimize() && !FLAG_retry_self_opt) {
     // Self-optimization is a one-off thing. if it fails, don't try again.
     reset_value = Smi::kMaxValue;
   }
   if (isolate()->IsDebuggerActive()) {
     // Detect debug break requests as soon as possible.
     reset_value = FLAG_interrupt_budget >> 4;
   }
   __ Mov(x2, Operand(profiling_counter_));
   __ Mov(x3, Operand(Smi::FromInt(reset_value)));
-  __ Str(x3, FieldMemOperand(x2, JSGlobalPropertyCell::kValueOffset));
+  __ Str(x3, FieldMemOperand(x2, Cell::kValueOffset));
 }
 
 
 void FullCodeGenerator::EmitBackEdgeBookkeeping(IterationStatement* stmt,
                                                 Label* back_edge_target) {
   ASSERT(jssp.Is(__ StackPointer()));
   Comment cmnt(masm_, "[ Back edge bookkeeping");
   // Block literal pools whilst emitting back edge code.
   Assembler::BlockConstPoolScope block_const_pool(masm_);
   Label ok;
 
   int weight = 1;
   if (FLAG_weighted_back_edges) {
     ASSERT(back_edge_target->is_bound());
     int distance = masm_->SizeOfCodeGeneratedSince(back_edge_target);
     weight = Min(kMaxBackEdgeWeight,
-                 Max(1, distance / kBackEdgeDistanceUnit));
+                 Max(1, distance / kCodeSizeMultiplier));
   }
   EmitProfilingCounterDecrement(weight);
   __ B(pl, &ok);
   InterruptStub stub;
   __ CallStub(&stub);
 
   // TODO(all): Implement OSR/Crankshaft code.
 
   EmitProfilingCounterReset();
 
@@ skipping 23 matching lines @@
       ASSERT(x0.Is(result_register()));
     }
     if (FLAG_interrupt_at_exit || FLAG_self_optimization) {
       // Pretend that the exit is a backwards jump to the entry.
       int weight = 1;
       if (info_->ShouldSelfOptimize()) {
         weight = FLAG_interrupt_budget / FLAG_self_opt_count;
       } else if (FLAG_weighted_back_edges) {
         int distance = masm_->pc_offset();
         weight = Min(kMaxBackEdgeWeight,
-                     Max(1, distance / kBackEdgeDistanceUnit));
+                     Max(1, distance / kCodeSizeMultiplier));
       }
       EmitProfilingCounterDecrement(weight);
       Label ok;
       __ B(pl, &ok);
       __ Push(x0);
       if (info_->ShouldSelfOptimize() && FLAG_direct_self_opt) {
         __ Ldr(x10, MemOperand(fp, JavaScriptFrameConstants::kFunctionOffset));
         __ Push(x10);
         __ CallRuntime(Runtime::kOptimizeFunctionOnNextCall, 1);
       } else {
@@ skipping 741 matching lines @@
   __ B(&loop);
 
   __ Bind(&no_descriptors);
   __ Drop(1);
   __ B(&exit);
 
   // We got a fixed array in register x0. Iterate through that.
   Label non_proxy;
   __ Bind(&fixed_array);
 
-  Handle<JSGlobalPropertyCell> cell =
-      isolate()->factory()->NewJSGlobalPropertyCell(
-          Handle<Object>(
-              Smi::FromInt(TypeFeedbackCells::kForInFastCaseMarker),
-              isolate()));
+  Handle<Cell> cell = isolate()->factory()->NewCell(
+      Handle<Object>(Smi::FromInt(TypeFeedbackCells::kForInFastCaseMarker),
+                     isolate()));
   RecordTypeFeedbackCell(stmt->ForInFeedbackId(), cell);
   __ LoadHeapObject(x1, cell);
   __ Mov(x10, Operand(Smi::FromInt(TypeFeedbackCells::kForInSlowCaseMarker)));
-  __ Str(x10, FieldMemOperand(x1, JSGlobalPropertyCell::kValueOffset));
+  __ Str(x10, FieldMemOperand(x1, Cell::kValueOffset));
 
   __ Mov(x1, Operand(Smi::FromInt(1)));  // Smi indicates slow check.
   __ Peek(x10, 0);  // Get enumerated object.
   STATIC_ASSERT(FIRST_JS_PROXY_TYPE == FIRST_SPEC_OBJECT_TYPE);
   // TODO(all): similar check was done already. Can we avoid it here?
   __ JumpIfObjectType(x10, x11, x12, LAST_JS_PROXY_TYPE, &non_proxy, gt);
   // TODO(all): use csel here
   __ Mov(x1, Operand(Smi::FromInt(0)));  // Zero indicates proxy.
   __ Bind(&non_proxy);
   __ Push(x1, x0);  // Smi and array
@@ skipping 640 matching lines @@
     Expression* subexpr = subexprs->at(i);
     // If the subexpression is a literal or a simple materialized literal it
     // is already set in the cloned array.
     if (subexpr->AsLiteral() != NULL ||
         CompileTimeValue::IsCompileTimeValue(subexpr)) {
       continue;
     }
 
     if (!result_saved) {
       __ Push(x0);
+      __ Push(Smi::FromInt(expr->literal_index()));
       result_saved = true;
     }
     VisitForAccumulatorValue(subexpr);
 
     if (IsFastObjectElementsKind(constant_elements_kind)) {
       int offset = FixedArray::kHeaderSize + (i * kPointerSize);
-      __ Peek(x6, 0);   // Copy of array literal.
+      __ Peek(x6, kPointerSize);  // Copy of array literal.
       __ Ldr(x1, FieldMemOperand(x6, JSObject::kElementsOffset));
       __ Str(result_register(), FieldMemOperand(x1, offset));
       // Update the write barrier for the array store.
       __ RecordWriteField(x1, offset, result_register(), x10,
                           kLRHasBeenSaved, kDontSaveFPRegs,
                           EMIT_REMEMBERED_SET, INLINE_SMI_CHECK);
     } else {
-      __ Peek(x1, 0);   // Copy of array literal.
-      __ Ldr(x2, FieldMemOperand(x1, JSObject::kMapOffset));
       __ Mov(x3, Operand(Smi::FromInt(i)));
-      __ Mov(x4, Operand(Smi::FromInt(expr->literal_index())));
       StoreArrayLiteralElementStub stub;
       __ CallStub(&stub);
     }
 
     PrepareForBailoutForId(expr->GetIdForElement(i), NO_REGISTERS);
   }
 
   if (result_saved) {
+    __ Drop(1);   // literal index
     context()->PlugTOS();
   } else {
     context()->Plug(x0);
   }
 }
 
 
 void FullCodeGenerator::VisitAssignment(Assignment* expr) {
   Comment cmnt(masm_, "[ Assignment");
   // Invalid left-hand sides are rewritten to have a 'throw ReferenceError'
@@ skipping 533 matching lines @@
       VisitForStackValue(args->at(i));
     }
   }
   // Record source position for debugger.
   SetSourcePosition(expr->position());
 
   // Record call targets in unoptimized code.
   flags = static_cast<CallFunctionFlags>(flags | RECORD_CALL_TARGET);
   Handle<Object> uninitialized =
       TypeFeedbackCells::UninitializedSentinel(isolate());
-  Handle<JSGlobalPropertyCell> cell =
-      isolate()->factory()->NewJSGlobalPropertyCell(uninitialized);
+  Handle<Cell> cell =
+      isolate()->factory()->NewCell(uninitialized);
   RecordTypeFeedbackCell(expr->CallFeedbackId(), cell);
   __ Mov(x2, Operand(cell));
 
   CallFunctionStub stub(arg_count, flags);
   __ Peek(x1, (arg_count + 1) * kXRegSizeInBytes);
   __ CallStub(&stub, expr->CallFeedbackId());
   RecordJSReturnSite(expr);
   // Restore context register.
   __ Ldr(cp, MemOperand(fp, StandardFrameConstants::kContextOffset));
   context()->DropAndPlug(1, x0);
@@ skipping 184 matching lines @@
   // constructor invocation.
   SetSourcePosition(expr->position());
 
   // Load function and argument count into x1 and x0.
   __ Mov(x0, arg_count);
   __ Peek(x1, arg_count * kXRegSizeInBytes);
 
   // Record call targets in unoptimized code.
   Handle<Object> uninitialized =
       TypeFeedbackCells::UninitializedSentinel(isolate());
-  Handle<JSGlobalPropertyCell> cell =
-      isolate()->factory()->NewJSGlobalPropertyCell(uninitialized);
+  Handle<Cell> cell =
+      isolate()->factory()->NewCell(uninitialized);
   RecordTypeFeedbackCell(expr->CallNewFeedbackId(), cell);
   __ Mov(x2, Operand(cell));
 
   CallConstructStub stub(RECORD_CALL_TARGET);
   __ Call(stub.GetCode(isolate()), RelocInfo::CONSTRUCT_CALL);
   PrepareForBailoutForId(expr->ReturnId(), TOS_REG);
   context()->Plug(x0);
 }
 
 
@@ skipping 1894 matching lines @@
 }
 
 
 void FullCodeGenerator::VisitYield(Yield* expr) {
   Comment cmnt(masm_, "[ Yield");
   // Evaluate yielded value first; the initial iterator definition depends on
   // this. It stays on the stack while we update the iterator.
   VisitForStackValue(expr->expression());
 
   switch (expr->yield_kind()) {
-    case Yield::INITIAL:
-    case Yield::SUSPEND: {
+    case Yield::SUSPEND:
+      // Pop value from top-of-stack slot; box result into result register.
+      EmitCreateIteratorResult(false);
+      __ Push(result_register());
+      // Fall through.
+    case Yield::INITIAL: {
       VisitForStackValue(expr->generator_object());
       __ CallRuntime(Runtime::kSuspendJSGeneratorObject, 1);
       __ Ldr(context_register(),
              MemOperand(fp, StandardFrameConstants::kContextOffset));
 
       Label resume;
       __ JumpIfNotRoot(result_register(), Heap::kTheHoleValueRootIndex,
                        &resume);
-      if (expr->yield_kind() == Yield::SUSPEND) {
-        EmitReturnIteratorResult(false);
-      } else {
-        __ Pop(result_register());
-        EmitReturnSequence();
-      }
+      __ Pop(result_register());
+      EmitReturnSequence();
 
       __ Bind(&resume);
       context()->Plug(result_register());
       break;
     }
 
     case Yield::FINAL: {
       VisitForAccumulatorValue(expr->generator_object());
       __ Mov(x1, Operand(Smi::FromInt(JSGeneratorObject::kGeneratorClosed)));
       __ Str(x1, FieldMemOperand(result_register(),
                                  JSGeneratorObject::kContinuationOffset));
-      EmitReturnIteratorResult(true);
+      // Pop value from top-of-stack slot, box result into result register.
+      EmitCreateIteratorResult(true);
+      EmitUnwindBeforeReturn();
+      EmitReturnSequence();
       break;
     }
 
     case Yield::DELEGATING: {
       VisitForStackValue(expr->generator_object());
 
       // Initial stack layout is as follows:
       // [sp + 1 * kPointerSize] iter
       // [sp + 0 * kPointerSize] g
 
       // TODO(jbramley): Tidy this up once the merge is done, using named
       // registers and suchlike. The implementation changes a little by
       // bleeding_edge so I don't want to spend too much time on it now.
 
       Label l_catch, l_try, l_resume, l_next, l_call, l_loop;
       // Initial send value is undefined.
       __ LoadRoot(x0, Heap::kUndefinedValueRootIndex);
       __ B(&l_next);
 
-      // catch (e) { receiver = iter; f = iter.throw; arg = e; goto l_call; }
+      // catch (e) { receiver = iter; f = 'throw'; arg = e; goto l_call; }
       __ Bind(&l_catch);
       handler_table()->set(expr->index(), Smi::FromInt(l_catch.pos()));
+      __ LoadRoot(x2, Heap::kthrow_stringRootIndex);     // "throw"
       __ Peek(x3, 1 * kPointerSize);                     // iter
       __ Push(x3);                                       // iter
       __ Push(x0);                                       // exception
-      __ Mov(x0, x3);                                    // iter
-      __ LoadRoot(x2, Heap::kthrow_stringRootIndex);     // "throw"
-      Handle<Code> throw_ic = isolate()->builtins()->LoadIC_Initialize();
-      CallIC(throw_ic);                                  // iter.throw in x0
       __ B(&l_call);
 
-      // try { received = yield result.value }
+      // try { received = %yield result }
+      // Shuffle the received result above a try handler and yield it without
+      // re-boxing.
       __ Bind(&l_try);
-      __ Pop(x0);                                        // result.value
+      __ Pop(x0);                                        // result
       __ PushTryHandler(StackHandler::CATCH, expr->index());
       const int handler_size = StackHandlerConstants::kSize;
-      __ Push(x0);                                       // result.value
+      __ Push(x0);                                       // result
       __ Peek(x3, (1 * kPointerSize) + handler_size);    // g
       __ Push(x3);                                       // g
       __ CallRuntime(Runtime::kSuspendJSGeneratorObject, 1);
       __ Ldr(context_register(),
              MemOperand(fp, StandardFrameConstants::kContextOffset));
       __ JumpIfNotRoot(x0, Heap::kTheHoleValueRootIndex, &l_resume);
-      EmitReturnIteratorResult(false);
+      __ Pop(x0);                                        // result
+      EmitReturnSequence();
       __ Bind(&l_resume);                                // received in x0
       __ PopTryHandler();
 
-      // receiver = iter; f = iter.next; arg = received;
+      // receiver = iter; f = 'next'; arg = received;
       __ Bind(&l_next);
+      __ LoadRoot(x2, Heap::knext_stringRootIndex);      // "next"
       __ Peek(x3, 1 * kPointerSize);                     // iter
       __ Push(x3);                                       // iter
       __ Push(x0);                                       // received
-      __ Mov(x0, x3);                                    // iter
-      __ LoadRoot(x2, Heap::knext_stringRootIndex);      // "next"
-      Handle<Code> next_ic = isolate()->builtins()->LoadIC_Initialize();
-      CallIC(next_ic);                                   // iter.next in r0
 
-      // result = f.call(receiver, arg);
+      // result = receiver[f](arg);
       __ Bind(&l_call);
-      Label l_call_runtime;
-      __ JumpIfSmi(x0, &l_call_runtime);
-      __ JumpIfNotObjectType(x0, x1, x1, JS_FUNCTION_TYPE, &l_call_runtime);
-      __ Mov(x1, x0);
-      ParameterCount count(1);
-      __ InvokeFunction(x1, count, CALL_FUNCTION,
-                        NullCallWrapper(), CALL_AS_METHOD);
+      Handle<Code> ic = isolate()->stub_cache()->ComputeKeyedCallInitialize(1);
+      CallIC(ic);
       __ Ldr(cp, MemOperand(fp, StandardFrameConstants::kContextOffset));
-      __ B(&l_loop);
-      __ Bind(&l_call_runtime);
-      __ Push(x0);
-      __ CallRuntime(Runtime::kCall, 3);
 
-      // val = result.value; if (!result.done) goto l_try;
+      // if (!result.done) goto l_try;
       __ Bind(&l_loop);
-      // result.value
       __ Push(x0);                                       // save result
-      __ LoadRoot(x2, Heap::kvalue_stringRootIndex);     // "value"
-      Handle<Code> value_ic = isolate()->builtins()->LoadIC_Initialize();
-      CallIC(value_ic);                                  // result.value in x0
-      __ Pop(x1);                                        // result
-      __ Push(x0);                                       // result.value
-      __ Mov(x0, x1);                                    // result
       __ LoadRoot(x2, Heap::kdone_stringRootIndex);      // "done"
       Handle<Code> done_ic = isolate()->builtins()->LoadIC_Initialize();
       CallIC(done_ic);                                   // result.done in x0
       // The ToBooleanStub argument (result.done) is in x0.
       Handle<Code> bool_ic = ToBooleanStub::GetUninitialized(isolate());
       CallIC(bool_ic);
       __ Cbz(x0, &l_try);
 
       // result.value
-      __ Pop(x0);                                        // result.value
+      __ Pop(x0);                                        // result
+      __ LoadRoot(x2, Heap::kvalue_stringRootIndex);     // "value"
+      Handle<Code> value_ic = isolate()->builtins()->LoadIC_Initialize();
+      CallIC(value_ic);                                  // result.value in x0
       context()->DropAndPlug(2, x0);                     // drop iter and g
       break;
     }
   }
 }
 
 
 void FullCodeGenerator::EmitGeneratorResume(Expression *generator,
     Expression *value,
     JSGeneratorObject::ResumeMode resume_mode) {
@@ skipping 110 matching lines @@
   // Throw error if we attempt to operate on a running generator.
   __ Bind(&wrong_state);
   __ Push(generator_object);
   __ CallRuntime(Runtime::kThrowGeneratorStateError, 1);
 
   __ Bind(&done);
   context()->Plug(result_register());
 }
 
 
-void FullCodeGenerator::EmitReturnIteratorResult(bool done) {
+void FullCodeGenerator::EmitCreateIteratorResult(bool done) {
   Label gc_required;
   Label allocated;
 
   Handle<Map> map(isolate()->native_context()->generator_result_map());
 
   // Allocate and populate an object with this form: { value: VAL, done: DONE }
 
   Register result = x0;
   __ Allocate(map->instance_size(), result, x10, x11, &gc_required, TAG_OBJECT);
+  __ B(&allocated);
+
+  __ Bind(&gc_required);
+  __ Push(Smi::FromInt(map->instance_size()));
+  __ CallRuntime(Runtime::kAllocateInNewSpace, 1);
+  __ Ldr(context_register(),
+         MemOperand(fp, StandardFrameConstants::kContextOffset));
+
   __ Bind(&allocated);
-
   Register map_reg = x1;
   Register result_value = x2;
   Register boolean_done = x3;
   Register empty_fixed_array = x4;
   __ Mov(map_reg, Operand(map));
   __ Pop(result_value);
   __ Mov(boolean_done, Operand(isolate()->factory()->ToBoolean(done)));
   __ Mov(empty_fixed_array, Operand(isolate()->factory()->empty_fixed_array()));
   ASSERT_EQ(map->instance_size(), 5 * kPointerSize);
   // TODO(jbramley): Use Stp if possible.
   __ Str(map_reg, FieldMemOperand(result, HeapObject::kMapOffset));
   __ Str(empty_fixed_array,
          FieldMemOperand(result, JSObject::kPropertiesOffset));
   __ Str(empty_fixed_array, FieldMemOperand(result, JSObject::kElementsOffset));
   __ Str(result_value,
          FieldMemOperand(result,
                          JSGeneratorObject::kResultValuePropertyOffset));
   __ Str(boolean_done,
          FieldMemOperand(result,
                          JSGeneratorObject::kResultDonePropertyOffset));
 
   // Only the value field needs a write barrier, as the other values are in the
   // root set.
   __ RecordWriteField(result, JSGeneratorObject::kResultValuePropertyOffset,
                       x10, x11, kLRHasBeenSaved, kDontSaveFPRegs);
-
-  if (done) {
-    // Exit all nested statements.
-    NestedStatement* current = nesting_stack_;
-    int stack_depth = 0;
-    int context_length = 0;
-    while (current != NULL) {
-      current = current->Exit(&stack_depth, &context_length);
-    }
-    __ Drop(stack_depth);
-  }
-
-  EmitReturnSequence();
-
-  __ Bind(&gc_required);
-  __ Push(Smi::FromInt(map->instance_size()));
-  __ CallRuntime(Runtime::kAllocateInNewSpace, 1);
-  __ Ldr(context_register(),
-         MemOperand(fp, StandardFrameConstants::kContextOffset));
-  __ B(&allocated);
 }
 
 
 // TODO(all): I don't like this method.
 // It seems to me that in too many places x0 is used in place of this.
 // Also, this function is not suitable for all places where x0 should be
 // abstracted (eg. when used as an argument). But some places assume that the
 // first argument register is x0, and use this function instead.
 // Considering that most of the register allocation is hard-coded in the
 // FullCodeGen, that it is unlikely we will need to change it extensively, and
@@ skipping 137 matching lines @@
   return previous_;
 }
 
 
 #undef __
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_A64