Commit 8fc2101c authored by verwaest@chromium.org's avatar verwaest@chromium.org

Fix build

R=jkummerow@chromium.org

Review URL: https://chromiumcodereview.appspot.com/15881004

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@14815 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 3cb8f95c
...@@ -411,7 +411,7 @@ HValue* CodeStubGraphBuilder<KeyedLoadFastElementStub>::BuildCodeStub() { ...@@ -411,7 +411,7 @@ HValue* CodeStubGraphBuilder<KeyedLoadFastElementStub>::BuildCodeStub() {
HInstruction* load = BuildUncheckedMonomorphicElementAccess( HInstruction* load = BuildUncheckedMonomorphicElementAccess(
GetParameter(0), GetParameter(1), NULL, NULL, GetParameter(0), GetParameter(1), NULL, NULL,
casted_stub()->is_js_array(), casted_stub()->elements_kind(), casted_stub()->is_js_array(), casted_stub()->elements_kind(),
false, NEVER_RETURN_HOLE, STANDARD_STORE, Representation::Smi()); false, NEVER_RETURN_HOLE, STANDARD_STORE);
return load; return load;
} }
...@@ -456,8 +456,7 @@ HValue* CodeStubGraphBuilder<KeyedStoreFastElementStub>::BuildCodeStub() { ...@@ -456,8 +456,7 @@ HValue* CodeStubGraphBuilder<KeyedStoreFastElementStub>::BuildCodeStub() {
BuildUncheckedMonomorphicElementAccess( BuildUncheckedMonomorphicElementAccess(
GetParameter(0), GetParameter(1), GetParameter(2), NULL, GetParameter(0), GetParameter(1), GetParameter(2), NULL,
casted_stub()->is_js_array(), casted_stub()->elements_kind(), casted_stub()->is_js_array(), casted_stub()->elements_kind(),
true, NEVER_RETURN_HOLE, casted_stub()->store_mode(), true, NEVER_RETURN_HOLE, casted_stub()->store_mode());
Representation::Smi());
return GetParameter(2); return GetParameter(2);
} }
...@@ -573,9 +572,8 @@ HValue* CodeStubGraphBuilder<ArraySingleArgumentConstructorStub>:: ...@@ -573,9 +572,8 @@ HValue* CodeStubGraphBuilder<ArraySingleArgumentConstructorStub>::
new(zone()) HConstant(initial_capacity, Representation::Tagged()); new(zone()) HConstant(initial_capacity, Representation::Tagged());
AddInstruction(initial_capacity_node); AddInstruction(initial_capacity_node);
HBoundsCheck* checked_arg = AddBoundsCheck(argument, max_alloc_length, HBoundsCheck* checked_arg = AddBoundsCheck(
ALLOW_SMI_KEY, argument, max_alloc_length, ALLOW_SMI_KEY);
Representation::Smi());
IfBuilder if_builder(this); IfBuilder if_builder(this);
if_builder.IfCompare(checked_arg, constant_zero, Token::EQ); if_builder.IfCompare(checked_arg, constant_zero, Token::EQ);
if_builder.Then(); if_builder.Then();
......
...@@ -978,10 +978,9 @@ void HGraphBuilder::AddSimulate(BailoutId id, ...@@ -978,10 +978,9 @@ void HGraphBuilder::AddSimulate(BailoutId id,
HBoundsCheck* HGraphBuilder::AddBoundsCheck(HValue* index, HBoundsCheck* HGraphBuilder::AddBoundsCheck(HValue* index,
HValue* length, HValue* length,
BoundsCheckKeyMode key_mode, BoundsCheckKeyMode key_mode) {
Representation r) {
HBoundsCheck* result = new(graph()->zone()) HBoundsCheck( HBoundsCheck* result = new(graph()->zone()) HBoundsCheck(
index, length, key_mode, r); index, length, key_mode);
AddInstruction(result); AddInstruction(result);
return result; return result;
} }
...@@ -1221,8 +1220,7 @@ HInstruction* HGraphBuilder::BuildUncheckedMonomorphicElementAccess( ...@@ -1221,8 +1220,7 @@ HInstruction* HGraphBuilder::BuildUncheckedMonomorphicElementAccess(
ElementsKind elements_kind, ElementsKind elements_kind,
bool is_store, bool is_store,
LoadKeyedHoleMode load_mode, LoadKeyedHoleMode load_mode,
KeyedAccessStoreMode store_mode, KeyedAccessStoreMode store_mode) {
Representation checked_index_representation) {
ASSERT(!IsExternalArrayElementsKind(elements_kind) || !is_js_array); ASSERT(!IsExternalArrayElementsKind(elements_kind) || !is_js_array);
Zone* zone = this->zone(); Zone* zone = this->zone();
// No GVNFlag is necessary for ElementsKind if there is an explicit dependency // No GVNFlag is necessary for ElementsKind if there is an explicit dependency
...@@ -1278,8 +1276,7 @@ HInstruction* HGraphBuilder::BuildUncheckedMonomorphicElementAccess( ...@@ -1278,8 +1276,7 @@ HInstruction* HGraphBuilder::BuildUncheckedMonomorphicElementAccess(
return result; return result;
} else { } else {
ASSERT(store_mode == STANDARD_STORE); ASSERT(store_mode == STANDARD_STORE);
checked_key = AddBoundsCheck( checked_key = AddBoundsCheck(key, length, ALLOW_SMI_KEY);
key, length, ALLOW_SMI_KEY, checked_index_representation);
HLoadExternalArrayPointer* external_elements = HLoadExternalArrayPointer* external_elements =
new(zone) HLoadExternalArrayPointer(elements); new(zone) HLoadExternalArrayPointer(elements);
AddInstruction(external_elements); AddInstruction(external_elements);
...@@ -1304,8 +1301,7 @@ HInstruction* HGraphBuilder::BuildUncheckedMonomorphicElementAccess( ...@@ -1304,8 +1301,7 @@ HInstruction* HGraphBuilder::BuildUncheckedMonomorphicElementAccess(
length, key, is_js_array); length, key, is_js_array);
checked_key = key; checked_key = key;
} else { } else {
checked_key = AddBoundsCheck( checked_key = AddBoundsCheck(key, length, ALLOW_SMI_KEY);
key, length, ALLOW_SMI_KEY, checked_index_representation);
if (is_store && (fast_elements || fast_smi_only_elements)) { if (is_store && (fast_elements || fast_smi_only_elements)) {
if (store_mode == STORE_NO_TRANSITION_HANDLE_COW) { if (store_mode == STORE_NO_TRANSITION_HANDLE_COW) {
...@@ -1477,9 +1473,8 @@ void HGraphBuilder::BuildNewSpaceArrayCheck(HValue* length, ElementsKind kind) { ...@@ -1477,9 +1473,8 @@ void HGraphBuilder::BuildNewSpaceArrayCheck(HValue* length, ElementsKind kind) {
AddInstruction(max_size_constant); AddInstruction(max_size_constant);
// Since we're forcing Integer32 representation for this HBoundsCheck, // Since we're forcing Integer32 representation for this HBoundsCheck,
// there's no need to Smi-check the index. // there's no need to Smi-check the index.
AddInstruction(new(zone) AddInstruction(new(zone) HBoundsCheck(
HBoundsCheck(length, max_size_constant, length, max_size_constant, DONT_ALLOW_SMI_KEY));
DONT_ALLOW_SMI_KEY, Representation::Integer32()));
} }
......
...@@ -963,8 +963,7 @@ class HGraphBuilder { ...@@ -963,8 +963,7 @@ class HGraphBuilder {
HBoundsCheck* AddBoundsCheck( HBoundsCheck* AddBoundsCheck(
HValue* index, HValue* index,
HValue* length, HValue* length,
BoundsCheckKeyMode key_mode = DONT_ALLOW_SMI_KEY, BoundsCheckKeyMode key_mode = DONT_ALLOW_SMI_KEY);
Representation r = Representation::None());
HReturn* AddReturn(HValue* value); HReturn* AddReturn(HValue* value);
...@@ -1025,8 +1024,7 @@ class HGraphBuilder { ...@@ -1025,8 +1024,7 @@ class HGraphBuilder {
ElementsKind elements_kind, ElementsKind elements_kind,
bool is_store, bool is_store,
LoadKeyedHoleMode load_mode, LoadKeyedHoleMode load_mode,
KeyedAccessStoreMode store_mode, KeyedAccessStoreMode store_mode);
Representation checked_index_representation = Representation::None());
HLoadNamedField* AddLoad( HLoadNamedField* AddLoad(
HValue *object, HValue *object,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment