Flesh out vector ic state query and set mechanisms.

src/ast-numbering.cc

Index: src/ast-numbering.cc
diff --git a/src/ast-numbering.cc b/src/ast-numbering.cc
index fbe40cac44f1b98a7edb6d0d5f78fda6c190d25c..e9b9050ae7d0caec6cb018e0e11b54e94fbd1b1b 100644
--- a/src/ast-numbering.cc
+++ b/src/ast-numbering.cc
@@ -69,14 +69,18 @@ class AstNumberingVisitor FINAL : public AstVisitor {
     FeedbackVectorRequirements reqs =
         node->ComputeFeedbackRequirements(isolate());
     if (reqs.slots() > 0) {
-      node->SetFirstFeedbackSlot(
-          FeedbackVectorSlot(properties_.feedback_slots()));
-      properties_.increase_feedback_slots(reqs.slots());
+      node->SetFirstFeedbackSlot(FeedbackVectorSlot(properties_.slots()));
+      properties_.increase_slots(reqs.slots());
     }
     if (reqs.ic_slots() > 0) {
-      node->SetFirstFeedbackICSlot(
-          FeedbackVectorICSlot(properties_.ic_feedback_slots()));
-      properties_.increase_ic_feedback_slots(reqs.ic_slots());
+      int ic_slots = properties_.ic_slots();
+      node->SetFirstFeedbackICSlot(FeedbackVectorICSlot(ic_slots));
+      properties_.increase_ic_slots(reqs.ic_slots());
+      if (FLAG_vector_ics) {

[Jakob Kummerow, 2014/11/27 14:15:58]

Do we even need this flag check? Wouldn't !FLAG_vector_ics imply
reqs.ic_slots==0, so we wouldn't get here?

[mvstanton, 2014/11/27 15:06:12]

Good point but no, because in the live tree we do have CALL_IC which is
vector-based. Since the live tree only has that one kind of IC, the
TypeFeedbackVector omits storing the little index that describes Kind when
FLAG_vector_ics is false.

+        for (int i = 0; i < reqs.ic_slots(); i++) {
+          properties_.SetKind(ic_slots + i, node->FeedbackICSlotKind(i));
+        }
+      }
     }
   }
 
@@ -285,6 +289,7 @@ void AstNumberingVisitor::VisitModuleLiteral(ModuleLiteral* node) {
 
 void AstNumberingVisitor::VisitCallRuntime(CallRuntime* node) {
   IncrementNodeCount();
+  ReserveFeedbackSlots(node);
   if (node->is_jsruntime()) {
     // Don't try to optimize JS runtime calls because we bailout on them.
     DisableCrankshaft(kCallToAJavaScriptRuntimeFunction);
@@ -535,6 +540,7 @@ void AstNumberingVisitor::VisitFunctionLiteral(FunctionLiteral* node) {
 void AstNumberingVisitor::Renumber(FunctionLiteral* node) {
   if (node->scope()->HasIllegalRedeclaration()) {
     node->scope()->VisitIllegalRedeclaration(this);
+    node->set_ast_properties(&properties_);
     return;
   }