Reviewers: Mads Ager,
Description:
Merge r8230 from bleeding edge to 3.3 branch.
BUG=85177
Please review this at http://codereview.chromium.org/7134041/
SVN Base: http://v8.googlecode.com/svn/branches/3.3/
Affected files:
M src/hydrogen-instructions.h
M src/hydrogen-instructions.cc
M src/hydrogen.h
M src/hydrogen.cc
M src/version.cc
A + test/mjsunit/regress/regress-85177.js
### BEGIN SVN COPY METADATA
#$ cp branches/bleeding_edge/test/mjsunit/regress/regress-85177.js
test/mjsunit/regress/regress-85177.js
### END SVN COPY METADATA
Index: src/hydrogen-instructions.cc
===================================================================
--- src/hydrogen-instructions.cc (revision 8230)
+++ src/hydrogen-instructions.cc (working copy)
@@ -1725,7 +1725,6 @@
void HBoundsCheck::Verify() {
HInstruction::Verify();
- ASSERT(HasNoUses());
}
Index: src/hydrogen-instructions.h
===================================================================
--- src/hydrogen-instructions.h (revision 8230)
+++ src/hydrogen-instructions.h (working copy)
@@ -591,6 +591,7 @@
void SetOperandAt(int index, HValue* value);
void DeleteAndReplaceWith(HValue* other);
+ void ReplaceAllUsesWith(HValue* other);
bool HasNoUses() const { return use_list_ == NULL; }
bool HasMultipleUses() const {
return use_list_ != NULL && use_list_->tail() != NULL;
@@ -680,8 +681,6 @@
// removed list node or NULL.
HUseListNode* RemoveUse(HValue* value, int index);
- void ReplaceAllUsesWith(HValue* other);
-
void RegisterUse(int index, HValue* new_value);
HBasicBlock* block_;
@@ -2334,6 +2333,7 @@
public:
HBoundsCheck(HValue* index, HValue* length)
: HBinaryOperation(index, length) {
+ set_representation(Representation::Integer32());
SetFlag(kUseGVN);
}
Index: src/hydrogen.cc
===================================================================
--- src/hydrogen.cc (revision 8230)
+++ src/hydrogen.cc (working copy)
@@ -2253,10 +2253,32 @@
gvn.Analyze();
}
+ // Replace the results of check instructions with the original value, if
the
+ // result is used. This is safe now, since we don't do code motion after
this
+ // point. It enables better register allocation since the value produced
by
+ // check instructions is really a copy of the original value.
+ graph()->ReplaceCheckedValues();
+
return graph();
}
+void HGraph::ReplaceCheckedValues() {
+ HPhase phase("Replace checked values", this);
+ for (int i = 0; i < blocks()->length(); ++i) {
+ HInstruction* instr = blocks()->at(i)->first();
+ while (instr != NULL) {
+ if (instr->IsBoundsCheck()) {
+ // Replace all uses of the checked value with the original input.
+ ASSERT(instr->UseCount() > 0);
+ instr->ReplaceAllUsesWith(HBoundsCheck::cast(instr)->index());
+ }
+ instr = instr->next();
+ }
+ }
+}
+
+
HInstruction* HGraphBuilder::AddInstruction(HInstruction* instr) {
ASSERT(current_block() != NULL);
current_block()->AddInstruction(instr);
@@ -3693,16 +3715,17 @@
bool is_array = (map->instance_type() == JS_ARRAY_TYPE);
HLoadElements* elements = new(zone()) HLoadElements(object);
HInstruction* length = NULL;
+ HInstruction* checked_key = NULL;
if (is_array) {
length = AddInstruction(new(zone()) HJSArrayLength(object));
- AddInstruction(new(zone()) HBoundsCheck(key, length));
+ checked_key = AddInstruction(new(zone()) HBoundsCheck(key, length));
AddInstruction(elements);
} else {
AddInstruction(elements);
length = AddInstruction(new(zone()) HFixedArrayLength(elements));
- AddInstruction(new(zone()) HBoundsCheck(key, length));
+ checked_key = AddInstruction(new(zone()) HBoundsCheck(key, length));
}
- return new(zone()) HLoadKeyedFastElement(elements, key);
+ return new(zone()) HLoadKeyedFastElement(elements, checked_key);
}
@@ -3720,13 +3743,14 @@
AddInstruction(elements);
HInstruction* length = new(zone()) HExternalArrayLength(elements);
AddInstruction(length);
- AddInstruction(new(zone()) HBoundsCheck(key, length));
+ HInstruction* checked_key =
+ AddInstruction(new(zone()) HBoundsCheck(key, length));
HLoadExternalArrayPointer* external_elements =
new(zone()) HLoadExternalArrayPointer(elements);
AddInstruction(external_elements);
HLoadKeyedSpecializedArrayElement* pixel_array_value =
new(zone()) HLoadKeyedSpecializedArrayElement(
- external_elements, key, expr->external_array_type());
+ external_elements, checked_key, expr->external_array_type());
return pixel_array_value;
}
@@ -3781,8 +3805,9 @@
} else {
length = AddInstruction(new(zone()) HFixedArrayLength(elements));
}
- AddInstruction(new(zone()) HBoundsCheck(key, length));
- return new(zone()) HStoreKeyedFastElement(elements, key, val);
+ HInstruction* checked_key =
+ AddInstruction(new(zone()) HBoundsCheck(key, length));
+ return new(zone()) HStoreKeyedFastElement(elements, checked_key, val);
}
@@ -3801,7 +3826,8 @@
AddInstruction(elements);
HInstruction* length = AddInstruction(
new(zone()) HExternalArrayLength(elements));
- AddInstruction(new(zone()) HBoundsCheck(key, length));
+ HInstruction* checked_key =
+ AddInstruction(new(zone()) HBoundsCheck(key, length));
HLoadExternalArrayPointer* external_elements =
new(zone()) HLoadExternalArrayPointer(elements);
AddInstruction(external_elements);
@@ -3812,7 +3838,7 @@
}
return new(zone()) HStoreKeyedSpecializedArrayElement(
external_elements,
- key,
+ checked_key,
val,
expr->external_array_type());
}
@@ -3863,8 +3889,9 @@
HInstruction* elements = AddInstruction(new(zone())
HArgumentsElements);
HInstruction* length = AddInstruction(
new(zone()) HArgumentsLength(elements));
- AddInstruction(new(zone()) HBoundsCheck(key, length));
- result = new(zone()) HAccessArgumentsAt(elements, length, key);
+ HInstruction* checked_key =
+ AddInstruction(new(zone()) HBoundsCheck(key, length));
+ result = new(zone()) HAccessArgumentsAt(elements, length, checked_key);
}
ast_context()->ReturnInstruction(result, expr->id());
return true;
@@ -4954,8 +4981,9 @@
AddInstruction(HCheckInstanceType::NewIsString(string));
HStringLength* length = new(zone()) HStringLength(string);
AddInstruction(length);
- AddInstruction(new(zone()) HBoundsCheck(index, length));
- return new(zone()) HStringCharCodeAt(string, index);
+ HInstruction* checked_index =
+ AddInstruction(new(zone()) HBoundsCheck(index, length));
+ return new(zone()) HStringCharCodeAt(string, checked_index);
}
Index: src/hydrogen.h
===================================================================
--- src/hydrogen.h (revision 8230)
+++ src/hydrogen.h (working copy)
@@ -223,6 +223,7 @@
void Canonicalize();
void OrderBlocks();
void AssignDominators();
+ void ReplaceCheckedValues();
// Returns false if there are phi-uses of the arguments-object
// which are not supported by the optimizing compiler.
Index: src/version.cc
===================================================================
--- src/version.cc (revision 8230)
+++ src/version.cc (working copy)
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 3
#define BUILD_NUMBER 10
-#define PATCH_LEVEL 8
+#define PATCH_LEVEL 9
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
Index: test/mjsunit/regress/regress-85177.js
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
