| Index: runtime/vm/intermediate_language_arm64.cc
|
| diff --git a/runtime/vm/intermediate_language_arm64.cc b/runtime/vm/intermediate_language_arm64.cc
|
| index f627e6ea97b8f01d5a4a08a77a9dc294a8aae2e1..29eae7dc6be5daa36fe9d6f2bcccabe825cfceac 100644
|
| --- a/runtime/vm/intermediate_language_arm64.cc
|
| +++ b/runtime/vm/intermediate_language_arm64.cc
|
| @@ -822,8 +822,8 @@ void NativeCallInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| }
|
|
|
|
|
| -LocationSummary* StringFromCharCodeInstr::MakeLocationSummary(Zone* zone,
|
| - bool opt) const {
|
| +LocationSummary* OneByteStringFromCharCodeInstr::MakeLocationSummary(
|
| + Zone* zone, bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| // TODO(fschneider): Allow immediate operands for the char code.
|
| return LocationSummary::Make(zone,
|
| @@ -833,7 +833,8 @@ LocationSummary* StringFromCharCodeInstr::MakeLocationSummary(Zone* zone,
|
| }
|
|
|
|
|
| -void StringFromCharCodeInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| +void OneByteStringFromCharCodeInstr::EmitNativeCode(
|
| + FlowGraphCompiler* compiler) {
|
| ASSERT(compiler->is_optimizing());
|
| const Register char_code = locs()->in(0).reg();
|
| const Register result = locs()->out(0).reg();
|
| @@ -968,6 +969,8 @@ CompileType LoadIndexedInstr::ComputeType() const {
|
| case kTypedDataUint16ArrayCid:
|
| case kOneByteStringCid:
|
| case kTwoByteStringCid:
|
| + case kExternalOneByteStringCid:
|
| + case kExternalTwoByteStringCid:
|
| case kTypedDataInt32ArrayCid:
|
| case kTypedDataUint32ArrayCid:
|
| return CompileType::FromCid(kSmiCid);
|
| @@ -992,6 +995,8 @@ Representation LoadIndexedInstr::representation() const {
|
| case kTypedDataUint16ArrayCid:
|
| case kOneByteStringCid:
|
| case kTwoByteStringCid:
|
| + case kExternalOneByteStringCid:
|
| + case kExternalTwoByteStringCid:
|
| return kTagged;
|
| case kTypedDataInt32ArrayCid:
|
| return kUnboxedInt32;
|
| @@ -1125,6 +1130,7 @@ void LoadIndexedInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| case kExternalTypedDataUint8ArrayCid:
|
| case kExternalTypedDataUint8ClampedArrayCid:
|
| case kOneByteStringCid:
|
| + case kExternalOneByteStringCid:
|
| ASSERT(index_scale() == 1);
|
| __ ldr(result, element_address, kUnsignedByte);
|
| __ SmiTag(result);
|
| @@ -1135,6 +1141,7 @@ void LoadIndexedInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| break;
|
| case kTypedDataUint16ArrayCid:
|
| case kTwoByteStringCid:
|
| + case kExternalTwoByteStringCid:
|
| __ ldr(result, element_address, kUnsignedHalfword);
|
| __ SmiTag(result);
|
| break;
|
|
|