Megamorphic code cleanup.

runtime/vm/flow_graph_compiler_ia32.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/globals.h"  // Needed here to get TARGET_ARCH_IA32.
 #if defined(TARGET_ARCH_IA32)
 
 #include "vm/flow_graph_compiler.h"
 
 #include "vm/ast_printer.h"
@@ skipping 11 matching lines @@
 #include "vm/stack_frame.h"
 #include "vm/stub_code.h"
 #include "vm/symbols.h"
 
 namespace dart {
 
 DEFINE_FLAG(bool, trap_on_deoptimization, false, "Trap on deoptimization.");
 DEFINE_FLAG(bool, unbox_mints, true, "Optimize 64-bit integer arithmetic.");
 
 DECLARE_FLAG(bool, enable_simd_inline);
-DECLARE_FLAG(bool, use_megamorphic_stub);
 
 
 void MegamorphicSlowPath::EmitNativeCode(FlowGraphCompiler* compiler) {
   Assembler* assembler = compiler->assembler();
 #define __ assembler->
   __ Bind(entry_label());
   __ Comment("MegamorphicSlowPath");
   compiler->EmitMegamorphicInstanceCall(ic_data_, argument_count_, deopt_id_,
                                         token_pos_, locs_, try_index_);
   __ jmp(exit_label());
@@ skipping 1269 matching lines @@
     __ CompareClassId(EBX, kOneByteStringCid, EAX);
     __ j(NOT_EQUAL, &megamorphic_call, Assembler::kNearJump);
     __ movl(EAX, FieldAddress(EBX, String::hash_offset()));
     __ cmpl(EAX, Immediate(0));
     __ j(NOT_EQUAL, &done, Assembler::kNearJump);
 
     __ Bind(&megamorphic_call);
     __ Comment("Slow case: megamorphic call");
   }
   __ LoadObject(ECX, cache);
-  if (FLAG_use_megamorphic_stub) {
-    __ call(Address(THR, Thread::megamorphic_lookup_entry_point_offset()));
-  } else  {
-    StubCode::EmitMegamorphicLookup(assembler());
-  }
+  __ call(Address(THR, Thread::megamorphic_lookup_entry_point_offset()));
   __ call(EBX);
 
   __ Bind(&done);
   AddCurrentDescriptor(RawPcDescriptors::kOther,
       Thread::kNoDeoptId, token_pos);
   RecordSafepoint(locs, slow_path_argument_count);
   const intptr_t deopt_id_after = Thread::ToDeoptAfter(deopt_id);
   // Precompilation not implemented on ia32 platform.
   ASSERT(!FLAG_precompiled_mode);
   if (is_optimizing()) {
@@ skipping 533 matching lines @@
   __ movups(reg, Address(ESP, 0));
   __ addl(ESP, Immediate(kFpuRegisterSize));
 }
 
 
 #undef __
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32