| Index: runtime/vm/intermediate_language_x64.cc
|
| ===================================================================
|
| --- runtime/vm/intermediate_language_x64.cc (revision 36458)
|
| +++ runtime/vm/intermediate_language_x64.cc (working copy)
|
| @@ -961,16 +961,16 @@
|
|
|
| if (is_external) {
|
| element_address = index.IsRegister()
|
| - ? FlowGraphCompiler::ExternalElementAddressForRegIndex(
|
| + ? compiler->ExternalElementAddressForRegIndex(
|
| index_scale(), array, index.reg())
|
| - : FlowGraphCompiler::ExternalElementAddressForIntIndex(
|
| + : compiler->ExternalElementAddressForIntIndex(
|
| index_scale(), array, Smi::Cast(index.constant()).Value());
|
| } else {
|
| ASSERT(this->array()->definition()->representation() == kTagged);
|
| element_address = index.IsRegister()
|
| - ? FlowGraphCompiler::ElementAddressForRegIndex(
|
| + ? compiler->ElementAddressForRegIndex(
|
| class_id(), index_scale(), array, index.reg())
|
| - : FlowGraphCompiler::ElementAddressForIntIndex(
|
| + : compiler->ElementAddressForIntIndex(
|
| class_id(), index_scale(), array,
|
| Smi::Cast(index.constant()).Value());
|
| }
|
| @@ -1143,16 +1143,16 @@
|
| Address element_address(kNoRegister, 0);
|
| if (is_external) {
|
| element_address = index.IsRegister()
|
| - ? FlowGraphCompiler::ExternalElementAddressForRegIndex(
|
| + ? compiler->ExternalElementAddressForRegIndex(
|
| index_scale(), array, index.reg())
|
| - : FlowGraphCompiler::ExternalElementAddressForIntIndex(
|
| + : compiler->ExternalElementAddressForIntIndex(
|
| index_scale(), array, Smi::Cast(index.constant()).Value());
|
| } else {
|
| ASSERT(this->array()->definition()->representation() == kTagged);
|
| element_address = index.IsRegister()
|
| - ? FlowGraphCompiler::ElementAddressForRegIndex(
|
| + ? compiler->ElementAddressForRegIndex(
|
| class_id(), index_scale(), array, index.reg())
|
| - : FlowGraphCompiler::ElementAddressForIntIndex(
|
| + : compiler->ElementAddressForIntIndex(
|
| class_id(), index_scale(), array,
|
| Smi::Cast(index.constant()).Value());
|
| }
|
|
|