Improve indexOf for one byte string receiver to work with other string classes.

runtime/vm/flow_graph_optimizer.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/flow_graph_optimizer.h"
 
 #include "vm/bit_vector.h"
 #include "vm/cha.h"
 #include "vm/dart_entry.h"
 #include "vm/flow_graph_builder.h"
@@ skipping 3106 matching lines @@
     // InvokeMathCFunctionInstr requires unboxed doubles. UnboxDouble
     // instructions contain type checks and conversions to double.
     ZoneGrowableArray<Value*>* args =
         new ZoneGrowableArray<Value*>(call->ArgumentCount());
     for (intptr_t i = 0; i < call->ArgumentCount(); i++) {
       args->Add(new Value(call->ArgumentAt(i)));
     }
     InvokeMathCFunctionInstr* invoke =
         new InvokeMathCFunctionInstr(args, call->deopt_id(), recognized_kind);
     ReplaceCall(call, invoke);
+  } else if (Library::PrivateCoreLibName(Symbols::ClassId()).Equals(
+      String::Handle(call->function().name()))) {
+    // Check for core library get:_classId.
+    intptr_t cid = Class::Handle(call->function().Owner()).id();
+    // Currently only implemented for a subset of classes.
+    ASSERT((cid == kOneByteStringCid) || (cid == kTwoByteStringCid) ||
+           (cid == kExternalOneByteStringCid) ||
+           (cid == kGrowableObjectArrayCid) ||
+           (cid == kImmutableArrayCid) || (cid == kArrayCid));
+    ConstantInstr* cid_instr = new ConstantInstr(Smi::Handle(Smi::New(cid)));
+    ReplaceCall(call, cid_instr);
   }
 }
 
 
 bool FlowGraphOptimizer::TryInlineInstanceSetter(InstanceCallInstr* instr,
                                                  const ICData& unary_ic_data) {
   ASSERT((unary_ic_data.NumberOfChecks() > 0) &&
       (unary_ic_data.num_args_tested() == 1));
   if (FLAG_enable_type_checks) {
     // Checked mode setters are inlined like normal methods by conventional
@@ skipping 4735 matching lines @@
   }
 
   // Insert materializations at environment uses.
   for (intptr_t i = 0; i < exits.length(); i++) {
     CreateMaterializationAt(exits[i], alloc, alloc->cls(), *fields);
   }
 }
 
 
 }  // namespace dart