Index: src/x64/full-codegen-x64.cc |
diff --git a/src/x64/full-codegen-x64.cc b/src/x64/full-codegen-x64.cc |
index d2627e15db6cdcf26fd5e42db2ae308dcd1fcfb4..beed6f26b8141d95194dab75e06d249cce3cd66d 100644 |
--- a/src/x64/full-codegen-x64.cc |
+++ b/src/x64/full-codegen-x64.cc |
@@ -2458,7 +2458,8 @@ void FullCodeGenerator::EmitInlineSmiBinaryOp(BinaryOperation* expr, |
} |
-void FullCodeGenerator::EmitClassDefineProperties(ClassLiteral* lit) { |
+void FullCodeGenerator::EmitClassDefineProperties(ClassLiteral* lit, |
+ int* used_store_slots) { |
// Constructor is in rax. |
DCHECK(lit != NULL); |
__ Push(rax); |
@@ -2469,10 +2470,6 @@ void FullCodeGenerator::EmitClassDefineProperties(ClassLiteral* lit) { |
__ movp(scratch, FieldOperand(rax, 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(); |
@@ -2495,7 +2492,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: |
@@ -2526,10 +2523,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()); |
} |