Revert "Customized support for feedback on calls to Array." and follow-up fixes.

src/type-info.cc

Index: src/type-info.cc
diff --git a/src/type-info.cc b/src/type-info.cc
index ca3baa1215ff29afba9e3a11b7c628c3040e4b22..83fcd0f25e79f030a6593b5984ab1ea25235806e 100644
--- a/src/type-info.cc
+++ b/src/type-info.cc
@@ -97,7 +97,9 @@ bool TypeFeedbackOracle::StoreIsKeyedPolymorphic(TypeFeedbackId ast_id) {
 
 bool TypeFeedbackOracle::CallIsMonomorphic(int slot) {
   Handle<Object> value = GetInfo(slot);
-  return value->IsAllocationSite() || value->IsJSFunction();
+  return FLAG_pretenuring_call_new
+      ? value->IsJSFunction()
+      : value->IsAllocationSite() || value->IsJSFunction();
 }
 
 
@@ -132,10 +134,7 @@ KeyedAccessStoreMode TypeFeedbackOracle::GetStoreMode(
 
 Handle<JSFunction> TypeFeedbackOracle::GetCallTarget(int slot) {
   Handle<Object> info = GetInfo(slot);
-  if (info->IsAllocationSite()) {
-    ASSERT(!FLAG_pretenuring_call_new);
-    return Handle<JSFunction>(isolate()->native_context()->array_function());
-  } else {
+  if (FLAG_pretenuring_call_new || info->IsJSFunction()) {
     return Handle<JSFunction>::cast(info);
   }
 
@@ -155,15 +154,6 @@ Handle<JSFunction> TypeFeedbackOracle::GetCallNewTarget(int slot) {
 }
 
 
-Handle<AllocationSite> TypeFeedbackOracle::GetCallAllocationSite(int slot) {
-  Handle<Object> info = GetInfo(slot);
-  if (info->IsAllocationSite()) {
-    return Handle<AllocationSite>::cast(info);
-  }
-  return Handle<AllocationSite>::null();
-}
-
-
 Handle<AllocationSite> TypeFeedbackOracle::GetCallNewAllocationSite(int slot) {
   Handle<Object> info = GetInfo(slot);
   if (FLAG_pretenuring_call_new || info->IsAllocationSite()) {