Enable optimizer pipeline for DBC.

runtime/vm/intermediate_language.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/intermediate_language.h"
 
 #include "vm/bit_vector.h"
 #include "vm/bootstrap.h"
 #include "vm/compiler.h"
 #include "vm/constant_propagator.h"
@@ skipping 3092 matching lines @@
                                  deopt_id(), token_pos(), locs());
     } else {
       compiler->GenerateInstanceCall(deopt_id(),
                                      token_pos(),
                                      ArgumentCount(),
                                      locs(),
                                      *call_ic_data);
     }
   }
 #else
+  call_ic_data = &ICData::ZoneHandle(call_ic_data->Original());
+
   // Emit smi fast path instruction. If fast-path succeeds it skips the next
   // instruction otherwise it falls through.
   if (function_name().raw() == Symbols::Plus().raw()) {
     __ AddTOS();
   } else if (function_name().raw() == Symbols::EqualOperator().raw()) {
     __ EqualTOS();
   } else if (function_name().raw() == Symbols::LAngleBracket().raw()) {
     __ LessThanTOS();
   } else if (function_name().raw() == Symbols::RAngleBracket().raw()) {
     __ GreaterThanTOS();
   } else if (function_name().raw() == Symbols::BitAnd().raw()) {
     __ BitAndTOS();
   } else if (function_name().raw() == Symbols::BitOr().raw()) {
     __ BitOrTOS();
   } else if (function_name().raw() == Symbols::Star().raw()) {
     __ MulTOS();
   }
 
   const intptr_t call_ic_data_kidx = __ AddConstant(*call_ic_data);
   switch (call_ic_data->NumArgsTested()) {
     case 1:
-      __ InstanceCall(ArgumentCount(), call_ic_data_kidx);
+      if (compiler->is_optimizing()) {
+        __ InstanceCall1Opt(ArgumentCount(), call_ic_data_kidx);
+      } else {
+        __ InstanceCall1(ArgumentCount(), call_ic_data_kidx);
+      }
       break;
     case 2:
-      __ InstanceCall2(ArgumentCount(), call_ic_data_kidx);
-      break;
-    case 3:
-      __ InstanceCall3(ArgumentCount(), call_ic_data_kidx);
+      if (compiler->is_optimizing()) {
+        __ InstanceCall2Opt(ArgumentCount(), call_ic_data_kidx);
+      } else {
+        __ InstanceCall2(ArgumentCount(), call_ic_data_kidx);
+      }
       break;
     default:
       UNIMPLEMENTED();
       break;
   }
   compiler->AddCurrentDescriptor(RawPcDescriptors::kIcCall,
                                  deopt_id(),
                                  token_pos());
+  compiler->RecordAfterCall(this);
+
+  if (compiler->is_optimizing()) {
+    __ PopLocal(locs()->out(0).reg());
+  }
 #endif  // !defined(TARGET_ARCH_DBC)
 }
 
 
 bool PolymorphicInstanceCallInstr::HasSingleRecognizedTarget() const {
   return ic_data().HasOneTarget() &&
       (MethodRecognizer::RecognizeKind(
           Function::Handle(ic_data().GetTargetAt(0))) !=
        MethodRecognizer::kUnknown);
 }
@@ skipping 86 matching lines @@
         Array::Handle(ArgumentsDescriptor::New(ArgumentCount(),
                                                argument_names())) :
         Array::Handle(ic_data()->arguments_descriptor());
   const intptr_t argdesc_kidx = __ AddConstant(arguments_descriptor);
 
   __ PushConstant(function());
   __ StaticCall(ArgumentCount(), argdesc_kidx);
   compiler->AddCurrentDescriptor(RawPcDescriptors::kUnoptStaticCall,
                                  deopt_id(),
                                  token_pos());
+
+  compiler->RecordAfterCall(this);
+
+  if (compiler->is_optimizing()) {
+    __ PopLocal(locs()->out(0).reg());
+  }
 #endif  // !defined(TARGET_ARCH_DBC)
 }
 
 
 void AssertAssignableInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   compiler->GenerateAssertAssignable(token_pos(),
                                      deopt_id(),
                                      dst_type(),
                                      dst_name(),
                                      locs());
 
   // DBC does not use LocationSummaries in the same way as other architectures.
 #if !defined(TARGET_ARCH_DBC)
   ASSERT(locs()->in(0).reg() == locs()->out(0).reg());
-#endif
+#else
+  ASSERT(!compiler->is_optimizing() ||
+         (locs()->in(0).reg() == locs()->out(0).reg()));
+#endif  // !defined(TARGET_ARCH_DBC)
 }
 
 
 LocationSummary* DeoptimizeInstr::MakeLocationSummary(Zone* zone,
                                                       bool opt) const {
   return new(zone) LocationSummary(zone, 0, 0, LocationSummary::kNoCall);
 }
 
 
 void DeoptimizeInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
@@ skipping 554 matching lines @@
   set_native_c_function(native_function);
   function().SetIsNativeAutoSetupScope(auto_setup_scope);
   Dart_NativeEntryResolver resolver = library.native_entry_resolver();
   bool is_bootstrap_native = Bootstrap::IsBootstapResolver(resolver);
   set_is_bootstrap_native(is_bootstrap_native);
 }
 
 #undef __
 
 }  // namespace dart