Enable optimizer pipeline for DBC.

runtime/vm/deopt_instructions.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/deopt_instructions.h"
 
 #include "vm/assembler.h"
 #include "vm/code_patcher.h"
 #include "vm/compiler.h"
 #include "vm/intermediate_language.h"
@@ skipping 48 matching lines @@
 
   // Do not include incoming arguments if there are optional arguments
   // (they are copied into local space at method entry).
   num_args_ =
       function.HasOptionalParameters() ? 0 : function.num_fixed_parameters();
 
   // The fixed size section of the (fake) Dart frame called via a stub by the
   // optimized function contains FP, PP (ARM and MIPS only), PC-marker and
   // return-address. This section is copied as well, so that its contained
   // values can be updated before returning to the deoptimized function.
+  // Note: on DBC stack grows upwards unlike on all other architectures.
   source_frame_size_ =
       + kDartFrameFixedSize  // For saved values below sp.
+#if !defined(TARGET_ARCH_DBC)
       + ((frame->fp() - frame->sp()) / kWordSize)  // For frame size incl. sp.
+#else
+      + ((frame->sp() - frame->fp()) / kWordSize)  // For frame size incl. sp.

[Florian Schneider, 2016/05/19 13:21:39]

In generate it would be nice to encapsulate more of this logic in the class
StackFrame - e.g. in stack_frame.h/.cc Can we make a helper

Here a helper FrameSize(frame)?

[Vyacheslav Egorov (Google), 2016/05/19 15:19:40]

I will keep this code without a helper for now.

+#endif  // !defined(TARGET_ARCH_DBC)
       + 1  // For fp.
       + kParamEndSlotFromFp  // For saved values above fp.
       + num_args_;  // For arguments.
+#if !defined(TARGET_ARCH_DBC)
   source_frame_ = reinterpret_cast<intptr_t*>(
       frame->sp() - (kDartFrameFixedSize * kWordSize));
+#else

[Florian Schneider, 2016/05/19 13:21:39]

A helper FrameStart(frame)?

[Vyacheslav Egorov (Google), 2016/05/19 15:19:40]

Done.

+  source_frame_ = reinterpret_cast<intptr_t*>(
+      frame->fp() - (kDartFrameFixedSize + num_args_) * kWordSize);
+#endif  // !defined(TARGET_ARCH_DBC)
 
   if (dest_options == kDestIsOriginalFrame) {
     // Work from a copy of the source frame.
     intptr_t* original_frame = source_frame_;
     source_frame_ = new intptr_t[source_frame_size_];
     ASSERT(source_frame_ != NULL);
     for (intptr_t i = 0; i < source_frame_size_; i++) {
       source_frame_[i] = original_frame[i];
     }
     source_frame_is_allocated_ = true;
@@ skipping 88 matching lines @@
     for (intptr_t i = 0; i < dest_frame_size_; i++) {
       if (dest_frame_[i] != 0) {
         visitor->VisitPointer(reinterpret_cast<RawObject**>(&dest_frame_[i]));
       }
     }
   }
 }
 
 
 intptr_t DeoptContext::DestStackAdjustment() const {
-  return (dest_frame_size_
-          - kDartFrameFixedSize
-          - num_args_
-          - kParamEndSlotFromFp
-          - 1);  // For fp.
+  return dest_frame_size_
+         - kDartFrameFixedSize
+         - num_args_
+#if !defined(TARGET_ARCH_DBC)
+         - 1  // For fp.
+#endif
+         - kParamEndSlotFromFp;
 }
 
 
 intptr_t DeoptContext::GetSourceFp() const {
+#if !defined(TARGET_ARCH_DBC)
   return source_frame_[source_frame_size_ - 1 - num_args_ -
                        kParamEndSlotFromFp];
+#else
+  return source_frame_[num_args_ + kDartFrameFixedSize +
+      kSavedCallerFpSlotFromFp];
+#endif
 }
 
 
 intptr_t DeoptContext::GetSourcePp() const {
+#if !defined(TARGET_ARCH_DBC)
   return source_frame_[source_frame_size_ - 1 - num_args_ -
                        kParamEndSlotFromFp +
                        StackFrame::SavedCallerPpSlotFromFp()];
+#else
+  UNREACHABLE();
+  return 0;
+#endif
 }
 
 
 intptr_t DeoptContext::GetSourcePc() const {
+#if !defined(TARGET_ARCH_DBC)
   return source_frame_[source_frame_size_ - num_args_ + kSavedPcSlotFromSp];
+#else
+  return source_frame_[num_args_ + kDartFrameFixedSize +
+      kSavedCallerPcSlotFromFp];
+#endif
 }
 
 
 intptr_t DeoptContext::GetCallerFp() const {
   return caller_fp_;
 }
 
 
 void DeoptContext::SetCallerFp(intptr_t caller_fp) {
   caller_fp_ = caller_fp;
@@ skipping 80 matching lines @@
     intptr_t* to_addr = GetDestFrameAddressAt(to_index);
     DeoptInstr* instr = deopt_instructions[from_index];
     if (!objects_only || IsObjectInstruction(instr->kind())) {
       instr->Execute(this, to_addr);
     } else {
       *reinterpret_cast<RawObject**>(to_addr) = Object::null();
     }
   }
 
   if (FLAG_trace_deoptimization_verbose) {
-    intptr_t* start = dest_frame_;
     for (intptr_t i = 0; i < frame_size; i++) {
-      OS::PrintErr("*%" Pd ". [0x%" Px "] 0x%" Px " [%s]\n",
+      intptr_t* to_addr = GetDestFrameAddressAt(i);
+      OS::PrintErr("*%" Pd ". [%p] 0x%" Px " [%s]\n",
                    i,
-                   reinterpret_cast<uword>(&start[i]),
-                   start[i],
+                   to_addr,
+                   *to_addr,
                    deopt_instructions[i + (len - frame_size)]->ToCString());
     }
   }
 }
 
 
 static void FillDeferredSlots(DeoptContext* deopt_context,
                               DeferredSlot** slot_list) {
   DeferredSlot* slot = *slot_list;
   *slot_list = NULL;
@@ skipping 329 matching lines @@
 
   virtual const char* ArgumentsToCString() const {
     return Thread::Current()->zone()->PrintToString(
         "%" Pd "", object_table_index_);
   }
 
   void Execute(DeoptContext* deopt_context, intptr_t* dest_addr) {
     Function& function = Function::Handle(deopt_context->zone());
     function ^= deopt_context->ObjectAt(object_table_index_);
     if (function.IsNull()) {
-      // There are no deoptimization stubs on DBC.
-#if !defined(TARGET_ARCH_DBC)
       *reinterpret_cast<RawObject**>(dest_addr) = deopt_context->is_lazy_deopt()
           ? StubCode::DeoptimizeLazy_entry()->code()
           : StubCode::Deoptimize_entry()->code();
-#endif
       return;
     }
 
 #if !defined(TARGET_ARCH_DBC)
     // We don't always have the Code object for the frame's corresponding
     // unoptimized code as it may have been collected. Use a stub as the pc
     // marker until we can recreate that Code object during deferred
     // materialization to maintain the invariant that Dart frames always have
     // a pc marker.
     *reinterpret_cast<RawObject**>(dest_addr) =
@@ skipping 43 matching lines @@
 class DeoptCallerFpInstr : public DeoptInstr {
  public:
   DeoptCallerFpInstr() {}
 
   virtual intptr_t source_index() const { return 0; }
   virtual DeoptInstr::Kind kind() const { return kCallerFp; }
 
   void Execute(DeoptContext* deopt_context, intptr_t* dest_addr) {
     *dest_addr = deopt_context->GetCallerFp();
     deopt_context->SetCallerFp(reinterpret_cast<intptr_t>(
-        dest_addr - (kSavedCallerFpSlotFromFp * kWordSize)));

[zra, 2016/05/19 16:24:27]

Oof. How was this working?

[Vyacheslav Egorov (Google), 2016/05/20 12:11:47]

kSavedCallerFpSlotFromFp is 0 on all architectures that are not DBC

+        dest_addr - kSavedCallerFpSlotFromFp));
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DeoptCallerFpInstr);
 };
 
 
 // Deoptimization instruction copying the caller saved PP from optimized frame.
 class DeoptCallerPpInstr : public DeoptInstr {
  public:
@@ skipping 576 matching lines @@
                           Smi* offset,
                           TypedData* info,
                           Smi* reason) {
   intptr_t i = index * kEntrySize;
   *offset ^= table.At(i);
   *info ^= table.At(i + 1);
   *reason ^= table.At(i + 2);
 }
 
 }  // namespace dart