Flesh out vector ic state query and set mechanisms.

src/ia32/full-codegen-ia32.cc

Index: src/ia32/full-codegen-ia32.cc
diff --git a/src/ia32/full-codegen-ia32.cc b/src/ia32/full-codegen-ia32.cc
index 672b46bb2568859538118bc11e82d28c74f877d1..a25164623757ce0344e3398b9f732a9f21463807 100644
--- a/src/ia32/full-codegen-ia32.cc
+++ b/src/ia32/full-codegen-ia32.cc
@@ -1254,6 +1254,7 @@ void FullCodeGenerator::EmitLoadHomeObject(SuperReference* expr) {
   if (FLAG_vector_ics) {
     __ mov(VectorLoadICDescriptor::SlotRegister(),
            Immediate(SmiFromSlot(expr->HomeObjectFeedbackSlot())));
+    FeedbackVector()->SetKind(expr->HomeObjectFeedbackSlot(), Code::LOAD_IC);
     CallLoadIC(NOT_CONTEXTUAL);
   } else {
     CallLoadIC(NOT_CONTEXTUAL, expr->HomeObjectFeedbackId());
@@ -1335,6 +1336,7 @@ void FullCodeGenerator::EmitLoadGlobalCheckExtensions(VariableProxy* proxy,
   if (FLAG_vector_ics) {
     __ mov(VectorLoadICDescriptor::SlotRegister(),
            Immediate(SmiFromSlot(proxy->VariableFeedbackSlot())));
+    FeedbackVector()->SetKind(proxy->VariableFeedbackSlot(), Code::LOAD_IC);
   }
 
   ContextualMode mode = (typeof_state == INSIDE_TYPEOF)
@@ -1422,6 +1424,7 @@ void FullCodeGenerator::EmitVariableLoad(VariableProxy* proxy) {
       if (FLAG_vector_ics) {
         __ mov(VectorLoadICDescriptor::SlotRegister(),
                Immediate(SmiFromSlot(proxy->VariableFeedbackSlot())));
+        FeedbackVector()->SetKind(proxy->VariableFeedbackSlot(), Code::LOAD_IC);
       }
       CallLoadIC(CONTEXTUAL);
       context()->Plug(eax);
@@ -2071,6 +2074,8 @@ void FullCodeGenerator::VisitYield(Yield* expr) {
       if (FLAG_vector_ics) {
         __ mov(VectorLoadICDescriptor::SlotRegister(),
                Immediate(SmiFromSlot(expr->KeyedLoadFeedbackSlot())));
+        FeedbackVector()->SetKind(expr->KeyedLoadFeedbackSlot(),
+                                  Code::KEYED_LOAD_IC);
       }
       Handle<Code> ic = CodeFactory::KeyedLoadIC(isolate()).code();
       CallIC(ic, TypeFeedbackId::None());
@@ -2091,6 +2096,7 @@ void FullCodeGenerator::VisitYield(Yield* expr) {
       if (FLAG_vector_ics) {
         __ mov(VectorLoadICDescriptor::SlotRegister(),
                Immediate(SmiFromSlot(expr->DoneFeedbackSlot())));
+        FeedbackVector()->SetKind(expr->DoneFeedbackSlot(), Code::LOAD_IC);
       }
       CallLoadIC(NOT_CONTEXTUAL);                        // result.done in eax
       Handle<Code> bool_ic = ToBooleanStub::GetUninitialized(isolate());
@@ -2105,6 +2111,7 @@ void FullCodeGenerator::VisitYield(Yield* expr) {
       if (FLAG_vector_ics) {
         __ mov(VectorLoadICDescriptor::SlotRegister(),
                Immediate(SmiFromSlot(expr->ValueFeedbackSlot())));
+        FeedbackVector()->SetKind(expr->ValueFeedbackSlot(), Code::LOAD_IC);
       }
       CallLoadIC(NOT_CONTEXTUAL);                         // result.value in eax
       context()->DropAndPlug(2, eax);                     // drop iter and g
@@ -2246,6 +2253,7 @@ void FullCodeGenerator::EmitNamedPropertyLoad(Property* prop) {
   if (FLAG_vector_ics) {
     __ mov(VectorLoadICDescriptor::SlotRegister(),
            Immediate(SmiFromSlot(prop->PropertyFeedbackSlot())));
+    FeedbackVector()->SetKind(prop->PropertyFeedbackSlot(), Code::LOAD_IC);
     CallLoadIC(NOT_CONTEXTUAL);
   } else {
     CallLoadIC(NOT_CONTEXTUAL, prop->PropertyFeedbackId());
@@ -2271,6 +2279,8 @@ void FullCodeGenerator::EmitKeyedPropertyLoad(Property* prop) {
   if (FLAG_vector_ics) {
     __ mov(VectorLoadICDescriptor::SlotRegister(),
            Immediate(SmiFromSlot(prop->PropertyFeedbackSlot())));
+    FeedbackVector()->SetKind(prop->PropertyFeedbackSlot(),
+                              Code::KEYED_LOAD_IC);
     CallIC(ic);
   } else {
     CallIC(ic, prop->PropertyFeedbackId());
@@ -2853,6 +2863,7 @@ void FullCodeGenerator::EmitCall(Call* expr, CallICState::CallType call_type) {
   __ mov(edi, Operand(esp, (arg_count + 1) * kPointerSize));
   // Don't assign a type feedback id to the IC, since type feedback is provided
   // by the vector above.
+  FeedbackVector()->SetKind(expr->CallFeedbackSlot(), Code::CALL_IC);
   CallIC(ic);
 
   RecordJSReturnSite(expr);
@@ -4343,6 +4354,7 @@ void FullCodeGenerator::VisitCallRuntime(CallRuntime* expr) {
     if (FLAG_vector_ics) {
       __ mov(VectorLoadICDescriptor::SlotRegister(),
              Immediate(SmiFromSlot(expr->CallRuntimeFeedbackSlot())));
+      FeedbackVector()->SetKind(expr->CallRuntimeFeedbackSlot(), Code::LOAD_IC);
       CallLoadIC(NOT_CONTEXTUAL);
     } else {
       CallLoadIC(NOT_CONTEXTUAL, expr->CallRuntimeFeedbackId());
@@ -4755,6 +4767,7 @@ void FullCodeGenerator::VisitForTypeofValue(Expression* expr) {
     if (FLAG_vector_ics) {
       __ mov(VectorLoadICDescriptor::SlotRegister(),
              Immediate(SmiFromSlot(proxy->VariableFeedbackSlot())));
+      FeedbackVector()->SetKind(proxy->VariableFeedbackSlot(), Code::LOAD_IC);
     }
     // Use a regular load, not a contextual load, to avoid a reference
     // error.