Reviewers: Jakob,
Message:
PTAL
Description:
Fix build
Please review this at https://chromiumcodereview.appspot.com/15881004/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files:
M src/code-stubs-hydrogen.cc
M src/hydrogen.h
M src/hydrogen.cc
Index: src/code-stubs-hydrogen.cc
diff --git a/src/code-stubs-hydrogen.cc b/src/code-stubs-hydrogen.cc
index
05af70401e9e3530dd68eea192b643c2eb7bc94c..433224e961cb822a397b5c292363020555ce1737
100644
--- a/src/code-stubs-hydrogen.cc
+++ b/src/code-stubs-hydrogen.cc
@@ -411,7 +411,7 @@ HValue*
CodeStubGraphBuilder<KeyedLoadFastElementStub>::BuildCodeStub() {
HInstruction* load = BuildUncheckedMonomorphicElementAccess(
GetParameter(0), GetParameter(1), NULL, NULL,
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;
}
@@ -456,8 +456,7 @@ HValue*
CodeStubGraphBuilder<KeyedStoreFastElementStub>::BuildCodeStub() {
BuildUncheckedMonomorphicElementAccess(
GetParameter(0), GetParameter(1), GetParameter(2), NULL,
casted_stub()->is_js_array(), casted_stub()->elements_kind(),
- true, NEVER_RETURN_HOLE, casted_stub()->store_mode(),
- Representation::Smi());
+ true, NEVER_RETURN_HOLE, casted_stub()->store_mode());
return GetParameter(2);
}
@@ -573,9 +572,8 @@ HValue*
CodeStubGraphBuilder<ArraySingleArgumentConstructorStub>::
new(zone()) HConstant(initial_capacity, Representation::Tagged());
AddInstruction(initial_capacity_node);
- HBoundsCheck* checked_arg = AddBoundsCheck(argument, max_alloc_length,
- ALLOW_SMI_KEY,
- Representation::Smi());
+ HBoundsCheck* checked_arg = AddBoundsCheck(
+ argument, max_alloc_length, ALLOW_SMI_KEY);
IfBuilder if_builder(this);
if_builder.IfCompare(checked_arg, constant_zero, Token::EQ);
if_builder.Then();
Index: src/hydrogen.cc
diff --git a/src/hydrogen.cc b/src/hydrogen.cc
index
6bbcfe02b236182368295473e425302e43a621c2..0ee6e53cfae3b9fef849c44373bee290b3cd07df
100644
--- a/src/hydrogen.cc
+++ b/src/hydrogen.cc
@@ -978,10 +978,9 @@ void HGraphBuilder::AddSimulate(BailoutId id,
HBoundsCheck* HGraphBuilder::AddBoundsCheck(HValue* index,
HValue* length,
- BoundsCheckKeyMode key_mode,
- Representation r) {
+ BoundsCheckKeyMode key_mode) {
HBoundsCheck* result = new(graph()->zone()) HBoundsCheck(
- index, length, key_mode, r);
+ index, length, key_mode);
AddInstruction(result);
return result;
}
@@ -1221,8 +1220,7 @@ HInstruction*
HGraphBuilder::BuildUncheckedMonomorphicElementAccess(
ElementsKind elements_kind,
bool is_store,
LoadKeyedHoleMode load_mode,
- KeyedAccessStoreMode store_mode,
- Representation checked_index_representation) {
+ KeyedAccessStoreMode store_mode) {
ASSERT(!IsExternalArrayElementsKind(elements_kind) || !is_js_array);
Zone* zone = this->zone();
// No GVNFlag is necessary for ElementsKind if there is an explicit
dependency
@@ -1278,8 +1276,7 @@ HInstruction*
HGraphBuilder::BuildUncheckedMonomorphicElementAccess(
return result;
} else {
ASSERT(store_mode == STANDARD_STORE);
- checked_key = AddBoundsCheck(
- key, length, ALLOW_SMI_KEY, checked_index_representation);
+ checked_key = AddBoundsCheck(key, length, ALLOW_SMI_KEY);
HLoadExternalArrayPointer* external_elements =
new(zone) HLoadExternalArrayPointer(elements);
AddInstruction(external_elements);
@@ -1304,8 +1301,7 @@ HInstruction*
HGraphBuilder::BuildUncheckedMonomorphicElementAccess(
length, key, is_js_array);
checked_key = key;
} else {
- checked_key = AddBoundsCheck(
- key, length, ALLOW_SMI_KEY, checked_index_representation);
+ checked_key = AddBoundsCheck(key, length, ALLOW_SMI_KEY);
if (is_store && (fast_elements || fast_smi_only_elements)) {
if (store_mode == STORE_NO_TRANSITION_HANDLE_COW) {
@@ -1477,9 +1473,8 @@ void HGraphBuilder::BuildNewSpaceArrayCheck(HValue*
length, ElementsKind kind) {
AddInstruction(max_size_constant);
// Since we're forcing Integer32 representation for this HBoundsCheck,
// there's no need to Smi-check the index.
- AddInstruction(new(zone)
- HBoundsCheck(length, max_size_constant,
- DONT_ALLOW_SMI_KEY,
Representation::Integer32()));
+ AddInstruction(new(zone) HBoundsCheck(
+ length, max_size_constant, DONT_ALLOW_SMI_KEY));
}
Index: src/hydrogen.h
diff --git a/src/hydrogen.h b/src/hydrogen.h
index
f7121245cbcdc01fda25a2e5279c526476f05689..a8afdc2e22bc5bea18a800e50edb4ca7b3e1b897
100644
--- a/src/hydrogen.h
+++ b/src/hydrogen.h
@@ -963,8 +963,7 @@ class HGraphBuilder {
HBoundsCheck* AddBoundsCheck(
HValue* index,
HValue* length,
- BoundsCheckKeyMode key_mode = DONT_ALLOW_SMI_KEY,
- Representation r = Representation::None());
+ BoundsCheckKeyMode key_mode = DONT_ALLOW_SMI_KEY);
HReturn* AddReturn(HValue* value);
@@ -1025,8 +1024,7 @@ class HGraphBuilder {
ElementsKind elements_kind,
bool is_store,
LoadKeyedHoleMode load_mode,
- KeyedAccessStoreMode store_mode,
- Representation checked_index_representation =
Representation::None());
+ KeyedAccessStoreMode store_mode);
HLoadNamedField* AddLoad(
HValue *object,
--
--
v8-dev mailing list
v8-dev@googlegroups.com
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to v8-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.