Index: src/code-stubs-hydrogen.cc |
diff --git a/src/code-stubs-hydrogen.cc b/src/code-stubs-hydrogen.cc |
index d5addc0368d864828f6ca4c0db0390566b40e1db..fb46633f0b3c961f20931053ea2a26d24263e885 100644 |
--- a/src/code-stubs-hydrogen.cc |
+++ b/src/code-stubs-hydrogen.cc |
@@ -1987,13 +1987,6 @@ class CodeStubGraphBuilder<KeyedLoadGenericStub> |
HValue* bit_field2, |
ElementsKind kind); |
- void BuildExternalElementLoad(HGraphBuilder::IfBuilder* if_builder, |
- HValue* receiver, |
- HValue* key, |
- HValue* instance_type, |
- HValue* bit_field2, |
- ElementsKind kind); |
- |
KeyedLoadGenericStub* casted_stub() { |
return static_cast<KeyedLoadGenericStub*>(stub()); |
} |
@@ -2015,8 +2008,6 @@ void CodeStubGraphBuilder<KeyedLoadGenericStub>::BuildElementsKindLimitCheck( |
void CodeStubGraphBuilder<KeyedLoadGenericStub>::BuildFastElementLoad( |
HGraphBuilder::IfBuilder* if_builder, HValue* receiver, HValue* key, |
HValue* instance_type, HValue* bit_field2, ElementsKind kind) { |
- DCHECK(!IsExternalArrayElementsKind(kind)); |
- |
BuildElementsKindLimitCheck(if_builder, bit_field2, kind); |
IfBuilder js_array_check(this); |
@@ -2036,20 +2027,6 @@ void CodeStubGraphBuilder<KeyedLoadGenericStub>::BuildFastElementLoad( |
} |
-void CodeStubGraphBuilder<KeyedLoadGenericStub>::BuildExternalElementLoad( |
- HGraphBuilder::IfBuilder* if_builder, HValue* receiver, HValue* key, |
- HValue* instance_type, HValue* bit_field2, ElementsKind kind) { |
- DCHECK(IsExternalArrayElementsKind(kind)); |
- |
- BuildElementsKindLimitCheck(if_builder, bit_field2, kind); |
- |
- Push(BuildUncheckedMonomorphicElementAccess(receiver, key, NULL, |
- false, kind, |
- LOAD, NEVER_RETURN_HOLE, |
- STANDARD_STORE)); |
-} |
- |
- |
HValue* CodeStubGraphBuilder<KeyedLoadGenericStub>::BuildCodeStub() { |
HValue* receiver = GetParameter(LoadDescriptor::kReceiverIndex); |
HValue* key = GetParameter(LoadDescriptor::kNameIndex); |
@@ -2111,42 +2088,6 @@ HValue* CodeStubGraphBuilder<KeyedLoadGenericStub>::BuildCodeStub() { |
Deoptimizer::EAGER); |
Push(graph()->GetConstant0()); |
- kind_if.Else(); |
- BuildExternalElementLoad(&kind_if, receiver, key, instance_type, bit_field2, |
- EXTERNAL_INT8_ELEMENTS); |
- |
- kind_if.Else(); |
- BuildExternalElementLoad(&kind_if, receiver, key, instance_type, bit_field2, |
- EXTERNAL_UINT8_ELEMENTS); |
- |
- kind_if.Else(); |
- BuildExternalElementLoad(&kind_if, receiver, key, instance_type, bit_field2, |
- EXTERNAL_INT16_ELEMENTS); |
- |
- kind_if.Else(); |
- BuildExternalElementLoad(&kind_if, receiver, key, instance_type, bit_field2, |
- EXTERNAL_UINT16_ELEMENTS); |
- |
- kind_if.Else(); |
- BuildExternalElementLoad(&kind_if, receiver, key, instance_type, bit_field2, |
- EXTERNAL_INT32_ELEMENTS); |
- |
- kind_if.Else(); |
- BuildExternalElementLoad(&kind_if, receiver, key, instance_type, bit_field2, |
- EXTERNAL_UINT32_ELEMENTS); |
- |
- kind_if.Else(); |
- BuildExternalElementLoad(&kind_if, receiver, key, instance_type, bit_field2, |
- EXTERNAL_FLOAT32_ELEMENTS); |
- |
- kind_if.Else(); |
- BuildExternalElementLoad(&kind_if, receiver, key, instance_type, bit_field2, |
- EXTERNAL_FLOAT64_ELEMENTS); |
- |
- kind_if.Else(); |
- BuildExternalElementLoad(&kind_if, receiver, key, instance_type, bit_field2, |
- EXTERNAL_UINT8_CLAMPED_ELEMENTS); |
- |
kind_if.ElseDeopt( |
Deoptimizer::kElementsKindUnhandledInKeyedLoadGenericStub); |
@@ -2234,7 +2175,7 @@ HValue* CodeStubGraphBuilder<KeyedLoadGenericStub>::BuildCodeStub() { |
index->ClearFlag(HValue::kCanOverflow); |
HValue* property_index = |
Add<HLoadKeyed>(cache_field_offsets, index, nullptr, |
- EXTERNAL_INT32_ELEMENTS, NEVER_RETURN_HOLE, 0); |
+ INT32_ELEMENTS, NEVER_RETURN_HOLE, 0); |
Push(property_index); |
} |
lookup_if->Else(); |