| Index: runtime/vm/flow_graph_optimizer.cc
|
| diff --git a/runtime/vm/flow_graph_optimizer.cc b/runtime/vm/flow_graph_optimizer.cc
|
| index 8e49cd350ded5782e9ab0447c2f45a9e37456f10..8165e25d1c94d57ca56ac48853e857a034108dc1 100644
|
| --- a/runtime/vm/flow_graph_optimizer.cc
|
| +++ b/runtime/vm/flow_graph_optimizer.cc
|
| @@ -1256,7 +1256,7 @@ bool FlowGraphOptimizer::TryInlineInstanceGetter(InstanceCallInstr* call) {
|
| }
|
|
|
|
|
| -LoadIndexedInstr* FlowGraphOptimizer::BuildStringCharCodeAt(
|
| +LoadIndexedInstr* FlowGraphOptimizer::BuildStringCodeUnitAt(
|
| InstanceCallInstr* call,
|
| intptr_t cid) {
|
| Definition* str = call->ArgumentAt(0);
|
| @@ -1364,11 +1364,11 @@ bool FlowGraphOptimizer::TryInlineInstanceMethod(InstanceCallInstr* call) {
|
| break;
|
| }
|
|
|
| - if ((recognized_kind == MethodRecognizer::kStringBaseCharCodeAt) &&
|
| + if ((recognized_kind == MethodRecognizer::kStringBaseCodeUnitAt) &&
|
| (ic_data.NumberOfChecks() == 1) &&
|
| ((class_ids[0] == kOneByteStringCid) ||
|
| (class_ids[0] == kTwoByteStringCid))) {
|
| - LoadIndexedInstr* instr = BuildStringCharCodeAt(call, class_ids[0]);
|
| + LoadIndexedInstr* instr = BuildStringCodeUnitAt(call, class_ids[0]);
|
| ReplaceCall(call, instr);
|
| return true;
|
| }
|
| @@ -1377,7 +1377,7 @@ bool FlowGraphOptimizer::TryInlineInstanceMethod(InstanceCallInstr* call) {
|
| (class_ids[0] == kOneByteStringCid)) {
|
| // TODO(fschneider): Handle TwoByteString.
|
| LoadIndexedInstr* load_char_code =
|
| - BuildStringCharCodeAt(call, class_ids[0]);
|
| + BuildStringCodeUnitAt(call, class_ids[0]);
|
| InsertBefore(call, load_char_code, NULL, Definition::kValue);
|
| StringFromCharCodeInstr* char_at =
|
| new StringFromCharCodeInstr(new Value(load_char_code),
|
|
|