Index: src/arm/full-codegen-arm.cc |
diff --git a/src/arm/full-codegen-arm.cc b/src/arm/full-codegen-arm.cc |
index 6758703dccb4c8f05f26d1cd62ae7fb0e8b0e313..9931e0a8066711a42b70493bb6a8cb5753f2215e 100644 |
--- a/src/arm/full-codegen-arm.cc |
+++ b/src/arm/full-codegen-arm.cc |
@@ -2550,7 +2550,8 @@ void FullCodeGenerator::EmitInlineSmiBinaryOp(BinaryOperation* expr, |
} |
-void FullCodeGenerator::EmitClassDefineProperties(ClassLiteral* lit) { |
+void FullCodeGenerator::EmitClassDefineProperties(ClassLiteral* lit, |
+ int* used_store_slots) { |
// Constructor is in r0. |
DCHECK(lit != NULL); |
__ push(r0); |
@@ -2562,10 +2563,6 @@ void FullCodeGenerator::EmitClassDefineProperties(ClassLiteral* lit) { |
FieldMemOperand(r0, JSFunction::kPrototypeOrInitialMapOffset)); |
__ push(scratch); |
- // store_slot_index points to the vector IC slot for the next store IC used. |
- // ClassLiteral::ComputeFeedbackRequirements controls the allocation of slots |
- // and must be updated if the number of store ICs emitted here changes. |
- int store_slot_index = 0; |
for (int i = 0; i < lit->properties()->length(); i++) { |
ObjectLiteral::Property* property = lit->properties()->at(i); |
Expression* value = property->value(); |
@@ -2589,7 +2586,7 @@ void FullCodeGenerator::EmitClassDefineProperties(ClassLiteral* lit) { |
VisitForStackValue(value); |
EmitSetHomeObjectIfNeeded(value, 2, |
- lit->SlotForHomeObject(value, &store_slot_index)); |
+ lit->SlotForHomeObject(value, used_store_slots)); |
switch (property->kind()) { |
case ObjectLiteral::Property::CONSTANT: |
@@ -2622,10 +2619,6 @@ void FullCodeGenerator::EmitClassDefineProperties(ClassLiteral* lit) { |
// constructor |
__ CallRuntime(Runtime::kToFastProperties, 1); |
- |
- // Verify that compilation exactly consumed the number of store ic slots that |
- // the ClassLiteral node had to offer. |
- DCHECK(!FLAG_vector_stores || store_slot_index == lit->slot_count()); |
} |