[ic] Unify CallIC feedback collection and handling.

src/crankshaft/typing.cc

 // Copyright 2013 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/crankshaft/typing.h"
 
 #include "src/ast/compile-time-value.h"
 #include "src/ast/scopes.h"
 #include "src/ast/variables.h"
 #include "src/frames-inl.h"
@@ skipping 499 matching lines @@
   RECURSE(Visit(expr->obj()));
   RECURSE(Visit(expr->key()));
 
   // We don't know anything about the result type.
 }
 
 
 void AstTyper::VisitCall(Call* expr) {
   // Collect type feedback.
   RECURSE(Visit(expr->expression()));
-  bool is_uninitialized = true;
-  if (expr->IsUsingCallFeedbackICSlot()) {
-    FeedbackVectorSlot slot = expr->CallFeedbackICSlot();
-    is_uninitialized = oracle()->CallIsUninitialized(slot);
-    if (!expr->expression()->IsProperty() &&
-        oracle()->CallIsMonomorphic(slot)) {
-      expr->set_target(oracle()->GetCallTarget(slot));
-      Handle<AllocationSite> site = oracle()->GetCallAllocationSite(slot);
-      expr->set_allocation_site(site);
-    }
+  FeedbackVectorSlot slot = expr->CallFeedbackICSlot();
+  bool is_uninitialized = oracle()->CallIsUninitialized(slot);
+  if (!expr->expression()->IsProperty() && oracle()->CallIsMonomorphic(slot)) {
+    expr->set_target(oracle()->GetCallTarget(slot));
+    Handle<AllocationSite> site = oracle()->GetCallAllocationSite(slot);
+    expr->set_allocation_site(site);
   }
 
   expr->set_is_uninitialized(is_uninitialized);
 
   ZoneList<Expression*>* args = expr->arguments();
   for (int i = 0; i < args->length(); ++i) {
     Expression* arg = args->at(i);
     RECURSE(Visit(arg));
   }
 
@@ skipping 257 matching lines @@
 }
 
 
 void AstTyper::VisitFunctionDeclaration(FunctionDeclaration* declaration) {
   RECURSE(Visit(declaration->fun()));
 }
 
 
 }  // namespace internal
 }  // namespace v8