Chromium Code Reviews| Index: src/hydrogen-instructions.h |
| diff --git a/src/hydrogen-instructions.h b/src/hydrogen-instructions.h |
| index 3aa15e375a78aee6cbb4b31395cb1a87957ebe54..bfde7eaccf0abfdef8d32895927422e2ac4ba22c 100644 |
| --- a/src/hydrogen-instructions.h |
| +++ b/src/hydrogen-instructions.h |
| @@ -5146,13 +5146,16 @@ class HFastLiteral: public HMaterializedLiteral<1> { |
| public: |
| HFastLiteral(HValue* context, |
| Handle<JSObject> boilerplate, |
| + Handle<JSObject> original_boilerplate, |
| int total_size, |
| int literal_index, |
| int depth, |
| AllocationSiteMode mode) |
| : HMaterializedLiteral<1>(literal_index, depth, mode), |
| boilerplate_(boilerplate), |
| + original_boilerplate_(original_boilerplate), |
| total_size_(total_size) { |
| + ASSERT(!boilerplate.is_identical_to(original_boilerplate)); |
| SetOperandAt(0, context); |
| SetGVNFlag(kChangesNewSpacePromotion); |
| } |
| @@ -5164,6 +5167,8 @@ class HFastLiteral: public HMaterializedLiteral<1> { |
| HValue* context() { return OperandAt(0); } |
| Handle<JSObject> boilerplate() const { return boilerplate_; } |
| + Handle<JSObject> original_boilerplate() const { |
| + return original_boilerplate_; } |
|
danno
2013/02/08 13:44:38
nit: } should be on next line
mvstanton
2013/02/11 11:11:24
Done.
|
| int total_size() const { return total_size_; } |
| virtual Representation RequiredInputRepresentation(int index) { |
| return Representation::Tagged(); |
| @@ -5177,6 +5182,7 @@ class HFastLiteral: public HMaterializedLiteral<1> { |
| private: |
| Handle<JSObject> boilerplate_; |
| + Handle<JSObject> original_boilerplate_; |
| int total_size_; |
| }; |
| @@ -5227,8 +5233,9 @@ class HObjectLiteral: public HMaterializedLiteral<1> { |
| bool fast_elements, |
| int literal_index, |
| int depth, |
| - bool has_function) |
| - : HMaterializedLiteral<1>(literal_index, depth), |
| + bool has_function, |
| + AllocationSiteMode mode) |
| + : HMaterializedLiteral<1>(literal_index, depth, mode), |
| constant_properties_(constant_properties), |
| fast_elements_(fast_elements), |
| has_function_(has_function) { |