Remove CallICs

src/typing.cc

 // Copyright 2013 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 437 matching lines @@
 }
 
 
 void AstTyper::VisitAssignment(Assignment* expr) {
   // Collect type feedback.
   Property* prop = expr->target()->AsProperty();
   if (prop != NULL) {
     TypeFeedbackId id = expr->AssignmentFeedbackId();
     expr->set_is_uninitialized(oracle()->StoreIsUninitialized(id));
     if (!expr->IsUninitialized()) {
-      expr->set_is_pre_monomorphic(oracle()->StoreIsPreMonomorphic(id));
       if (prop->key()->IsPropertyName()) {
         Literal* lit_key = prop->key()->AsLiteral();
         ASSERT(lit_key != NULL && lit_key->value()->IsString());
         Handle<String> name = Handle<String>::cast(lit_key->value());
         oracle()->AssignmentReceiverTypes(id, name, expr->GetReceiverTypes());
       } else {
         KeyedAccessStoreMode store_mode;
         oracle()->KeyedAssignmentReceiverTypes(
             id, expr->GetReceiverTypes(), &store_mode);
         expr->set_store_mode(store_mode);
       }
-      ASSERT(!expr->IsPreMonomorphic() || !expr->IsMonomorphic());
     }
   }
 
   Expression* rhs =
       expr->is_compound() ? expr->binary_operation() : expr->value();
   RECURSE(Visit(expr->target()));
   RECURSE(Visit(rhs));
   NarrowType(expr, rhs->bounds());
 
   VariableProxy* proxy = expr->target()->AsVariableProxy();
@@ skipping 17 matching lines @@
 
   NarrowType(expr, Bounds(Type::None(zone())));
 }
 
 
 void AstTyper::VisitProperty(Property* expr) {
   // Collect type feedback.
   TypeFeedbackId id = expr->PropertyFeedbackId();
   expr->set_is_uninitialized(oracle()->LoadIsUninitialized(id));
   if (!expr->IsUninitialized()) {
-    expr->set_is_pre_monomorphic(oracle()->LoadIsPreMonomorphic(id));
     if (expr->key()->IsPropertyName()) {
       Literal* lit_key = expr->key()->AsLiteral();
       ASSERT(lit_key != NULL && lit_key->value()->IsString());
       Handle<String> name = Handle<String>::cast(lit_key->value());
       bool is_prototype;
       oracle()->PropertyReceiverTypes(
           id, name, expr->GetReceiverTypes(), &is_prototype);
       expr->set_is_function_prototype(is_prototype);
     } else {
       bool is_string;
       oracle()->KeyedPropertyReceiverTypes(
           id, expr->GetReceiverTypes(), &is_string);
       expr->set_is_string_access(is_string);
     }
-    ASSERT(!expr->IsPreMonomorphic() || !expr->IsMonomorphic());
   }
 
   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.
-  expr->RecordTypeFeedback(oracle());
+  RECURSE(Visit(expr->expression()));
+  if (!expr->expression()->IsProperty() &&
+      oracle()->CallIsMonomorphic(expr->CallFeedbackId())) {
+    expr->set_target(oracle()->GetCallTarget(expr->CallFeedbackId()));
+  }
 
-  RECURSE(Visit(expr->expression()));
   ZoneList<Expression*>* args = expr->arguments();
   for (int i = 0; i < args->length(); ++i) {
     Expression* arg = args->at(i);
     RECURSE(Visit(arg));
   }
 
   VariableProxy* proxy = expr->expression()->AsVariableProxy();
   if (proxy != NULL && proxy->var()->is_possibly_eval(isolate())) {
     store_.Forget();  // Eval could do whatever to local variables.
   }
@@ skipping 243 matching lines @@
 void AstTyper::VisitModuleUrl(ModuleUrl* module) {
 }
 
 
 void AstTyper::VisitModuleStatement(ModuleStatement* stmt) {
   RECURSE(Visit(stmt->body()));
 }
 
 
 } }  // namespace v8::internal