DBC: Collect type feedback for fastpath smi ops

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 3020 matching lines @@
   if (!FLAG_two_args_smi_icd) {
     return 0;
   }
   switch (kind) {
     case Token::kADD: return StubCode::SmiAddInlineCache_entry();
     case Token::kSUB: return StubCode::SmiSubInlineCache_entry();
     case Token::kEQ:  return StubCode::SmiEqualInlineCache_entry();
     default:          return NULL;
   }
 }
+#else
+static void TryFastPathSmiOp(
+    FlowGraphCompiler* compiler, ICData* call_ic_data, const String& name) {
+  if (!FLAG_two_args_smi_icd) {
+    return;
+  }
+  if ((name.raw() == Symbols::Plus().raw()) ||
+      (name.raw() == Symbols::Minus().raw()) ||
+      (name.raw() == Symbols::EqualOperator().raw()) ||
+      (name.raw() == Symbols::LAngleBracket().raw()) ||
+      (name.raw() == Symbols::RAngleBracket().raw()) ||
+      (name.raw() == Symbols::BitAnd().raw()) ||
+      (name.raw() == Symbols::BitOr().raw()) ||
+      (name.raw() == Symbols::Star().raw())) {
+    bool is_smi_two_args_op = call_ic_data->AddSmiSmiCheckForFastSmiStubs();
+    ASSERT(is_smi_two_args_op);
+  }
+  if (name.raw() == Symbols::Plus().raw()) {
+    __ AddTOS();
+  } else if (name.raw() == Symbols::Minus().raw()) {
+    __ SubTOS();
+  } else if (name.raw() == Symbols::EqualOperator().raw()) {
+    __ EqualTOS();
+  } else if (name.raw() == Symbols::LAngleBracket().raw()) {
+    __ LessThanTOS();
+  } else if (name.raw() == Symbols::RAngleBracket().raw()) {
+    __ GreaterThanTOS();
+  } else if (name.raw() == Symbols::BitAnd().raw()) {
+    __ BitAndTOS();
+  } else if (name.raw() == Symbols::BitOr().raw()) {
+    __ BitOrTOS();
+  } else if (name.raw() == Symbols::Star().raw()) {
+    __ MulTOS();
+  }

[Vyacheslav Egorov (Google), 2016/05/31 14:55:44]

maybe:

} else {
  return;
}

bool is_smi_two_args_op = call_ic_data->AddSmiSmiCheckForFastSmiStubs();
ASSERT(is_smi_two_args_op);

then big if above is not needed.

[zra, 2016/05/31 16:33:12]

Done.

+}
 #endif
 
 
 void InstanceCallInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   Zone* zone = compiler->zone();
   const ICData* call_ic_data = NULL;
   if (!FLAG_propagate_ic_data || !compiler->is_optimizing() ||
       (ic_data() == NULL)) {
     const Array& arguments_descriptor =
         Array::Handle(zone, ArgumentsDescriptor::New(ArgumentCount(),
@@ skipping 52 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());
+  ICData* 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();
-  }
+  TryFastPathSmiOp(compiler, ic_data, function_name());
 
   const intptr_t call_ic_data_kidx = __ AddConstant(*call_ic_data);
-  switch (call_ic_data->NumArgsTested()) {
+  switch (ic_data->NumArgsTested()) {
     case 1:
       if (compiler->is_optimizing()) {
         __ InstanceCall1Opt(ArgumentCount(), call_ic_data_kidx);
       } else {
         __ InstanceCall1(ArgumentCount(), call_ic_data_kidx);
       }
       break;
     case 2:
       if (compiler->is_optimizing()) {
         __ InstanceCall2Opt(ArgumentCount(), call_ic_data_kidx);
@@ skipping 710 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