Revision: 16558
Author: [email protected]
Date: Thu Sep 5 16:22:46 2013 UTC
Log: Wrap PushLoad and BuildStoreInEffect in CHECK_ALIVE.
[email protected]
Review URL: https://chromiumcodereview.appspot.com/23903017
http://code.google.com/p/v8/source/detail?r=16558
Modified:
/branches/bleeding_edge/src/hydrogen.cc
/branches/bleeding_edge/src/hydrogen.h
=======================================
--- /branches/bleeding_edge/src/hydrogen.cc Thu Sep 5 13:20:51 2013 UTC
+++ /branches/bleeding_edge/src/hydrogen.cc Thu Sep 5 16:22:46 2013 UTC
@@ -4911,8 +4911,8 @@
Add<HDeoptimize>("Insufficient type feedback for property
assignment",
Deoptimizer::SOFT);
}
- return BuildStoreNamed(expr, expr->id(), expr->position(),
- expr->AssignmentId(), prop, object, value);
+ return BuildStoreNamed(
+ expr, expr->id(), expr->AssignmentId(), prop, object, value);
} else {
// Keyed store.
CHECK_ALIVE(VisitForValue(prop->key()));
@@ -4980,7 +4980,6 @@
void HOptimizedGraphBuilder::BuildStoreNamed(Expression* expr,
BailoutId id,
- int position,
BailoutId assignment_id,
Property* prop,
HValue* object,
@@ -5020,14 +5019,14 @@
} else if (types != NULL && types->length() > 1) {
Drop(2);
return HandlePolymorphicStoreNamedField(
- position, id, object, value, types, name);
+ expr->position(), id, object, value, types, name);
} else {
Drop(2);
instr = BuildStoreNamedGeneric(object, name, value);
}
if (!ast_context()->IsEffect()) Push(value);
- instr->set_position(position);
+ instr->set_position(expr->position());
AddInstruction(instr);
if (instr->HasObservableSideEffects()) {
Add<HSimulate>(id, REMOVABLE_SIMULATE);
@@ -5122,7 +5121,7 @@
// Named property.
CHECK_ALIVE(VisitForValue(prop->obj()));
HValue* object = Top();
- PushLoad(prop, object, expr->position());
+ CHECK_ALIVE(PushLoad(prop, object, expr->position()));
CHECK_ALIVE(VisitForValue(expr->value()));
HValue* right = Pop();
@@ -5134,8 +5133,8 @@
Add<HSimulate>(operation->id(), REMOVABLE_SIMULATE);
}
- return BuildStoreNamed(expr, expr->id(), expr->position(),
- expr->AssignmentId(), prop, object, instr);
+ return BuildStoreNamed(
+ expr, expr->id(), expr->AssignmentId(), prop, object, instr);
} else {
// Keyed property.
CHECK_ALIVE(VisitForValue(prop->obj()));
@@ -7473,6 +7472,19 @@
instr->ClearAllSideEffects();
return instr;
}
+
+
+void HOptimizedGraphBuilder::BuildStoreInEffect(Expression* expr,
+ Property* prop,
+ BailoutId ast_id,
+ BailoutId return_id,
+ HValue* object,
+ HValue* value) {
+ EffectContext for_effect(this);
+ Push(object);
+ Push(value);
+ BuildStoreNamed(expr, ast_id, return_id, prop, object, value);
+}
void HOptimizedGraphBuilder::VisitCountOperation(CountOperation* expr) {
@@ -7561,7 +7573,7 @@
CHECK_ALIVE(VisitForValue(prop->obj()));
HValue* object = Top();
- PushLoad(prop, object, expr->position());
+ CHECK_ALIVE(PushLoad(prop, object, expr->position()));
after = BuildIncrement(returns_original_input, expr);
@@ -7569,18 +7581,13 @@
HValue* result = Pop();
HValue* object = Pop();
environment()->SetExpressionStackAt(0, result);
- {
- EffectContext for_effect(this);
- Push(object);
- Push(after);
- BuildStoreNamed(expr, expr->id(), expr->position(),
- expr->AssignmentId(), prop, object, after);
- }
+ CHECK_ALIVE(BuildStoreInEffect(
+ expr, prop, expr->id(), expr->AssignmentId(), object, after));
return ast_context()->ReturnValue(Pop());
}
- return BuildStoreNamed(expr, expr->id(), expr->position(),
- expr->AssignmentId(), prop, object, after);
+ return BuildStoreNamed(
+ expr, expr->id(), expr->AssignmentId(), prop, object, after);
} else {
// Keyed property.
if (returns_original_input) Push(graph()->GetConstantUndefined());
=======================================
--- /branches/bleeding_edge/src/hydrogen.h Wed Sep 4 09:19:17 2013 UTC
+++ /branches/bleeding_edge/src/hydrogen.h Thu Sep 5 16:22:46 2013 UTC
@@ -2040,9 +2040,15 @@
HValue* object,
int position);
+ void BuildStoreInEffect(Expression* expression,
+ Property* prop,
+ BailoutId ast_id,
+ BailoutId return_id,
+ HValue* object,
+ HValue* value);
+
void BuildStoreNamed(Expression* expression,
BailoutId id,
- int position,
BailoutId assignment_id,
Property* prop,
HValue* object,
--
--
v8-dev mailing list
[email protected]
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 [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
