Add a soft-deopt in keyed element access when current IC is pre-monomorphic and no type feedback wa…

src/ic.cc

Index: src/ic.cc
diff --git a/src/ic.cc b/src/ic.cc
index a6ffb13ad40a84b16073b7d6b8a4bbb43ab7e702..1c946603a2b5a42dfed043974244e87f3f1fa601 100644
--- a/src/ic.cc
+++ b/src/ic.cc
@@ -1371,32 +1371,34 @@ MaybeObject* KeyedLoadIC::Load(Handle<Object> object,
     return LoadIC::Load(object, Handle<String>::cast(key));

[danno, 2013/10/21 16:35:59]

Don't you need to install the generic stub here, too? With a corresponding
trace?

[Hannes Payer (out of office), 2013/10/22 09:29:30]

Done.

   }
 
-  if (FLAG_use_ic && !object->IsAccessCheckNeeded()) {
-    ASSERT(!object->IsJSGlobalProxy());
+  if (FLAG_use_ic) {
     Handle<Code> stub = generic_stub();
-    if (miss_mode == MISS_FORCE_GENERIC) {
-      TRACE_GENERIC_IC(isolate(), "KeyedLoadIC", "force generic");
-    } else if (object->IsString() && key->IsNumber()) {
-      if (state() == UNINITIALIZED) stub = string_stub();
-    } else if (object->IsJSObject()) {
-      Handle<JSObject> receiver = Handle<JSObject>::cast(object);
-      if (receiver->elements()->map() ==
-          isolate()->heap()->non_strict_arguments_elements_map()) {
-        stub = non_strict_arguments_stub();
-      } else if (receiver->HasIndexedInterceptor()) {
-        stub = indexed_interceptor_stub();
-      } else if (!key->ToSmi()->IsFailure() &&
-                 (!target().is_identical_to(non_strict_arguments_stub()))) {
-        stub = LoadElementStub(receiver);
+    if (!object->IsAccessCheckNeeded()) {
+      ASSERT(!object->IsJSGlobalProxy());
+      if (miss_mode == MISS_FORCE_GENERIC) {
+        TRACE_GENERIC_IC(isolate(), "KeyedLoadIC", "force generic");
+      } else if (object->IsString() && key->IsNumber()) {
+        if (state() == UNINITIALIZED) stub = string_stub();

[danno, 2013/10/21 16:35:59]

need else here to TRACE_GENERIC

[Hannes Payer (out of office), 2013/10/22 09:29:30]

Done.

+      } else if (object->IsJSObject()) {
+        Handle<JSObject> receiver = Handle<JSObject>::cast(object);
+        if (receiver->elements()->map() ==
+            isolate()->heap()->non_strict_arguments_elements_map()) {
+          stub = non_strict_arguments_stub();
+        } else if (receiver->HasIndexedInterceptor()) {
+          stub = indexed_interceptor_stub();
+        } else if (!key->ToSmi()->IsFailure() &&
+                   (!target().is_identical_to(non_strict_arguments_stub()))) {
+          stub = LoadElementStub(receiver);
+        }

[danno, 2013/10/21 16:35:59]

need else here to TRACE_GENERIC

[Hannes Payer (out of office), 2013/10/22 09:29:30]

Done.

       }
+    } else {
+      TRACE_GENERIC_IC(isolate(), "KeyedLoadIC", "force generic");

[danno, 2013/10/21 16:35:59]

Comment is wrong. Should not be "force generic", but rather "access check
needed"

[Hannes Payer (out of office), 2013/10/22 09:29:30]

Done.

     }
-
     ASSERT(!stub.is_null());
     set_target(*stub);
     TRACE_IC("LoadIC", key);
   }
 
-
   return Runtime::GetObjectPropertyOrFail(isolate(), object, key);
 }
 
@@ -1981,6 +1983,10 @@ MaybeObject* KeyedStoreIC::Store(Handle<Object> object,
     ASSERT(!stub.is_null());
     set_target(*stub);
     TRACE_IC("StoreIC", key);
+  } else if (FLAG_use_ic) {
+     set_target(*generic_stub());
+     TRACE_GENERIC_IC(isolate(), "KeyedStoreIC", "force generic");
+     TRACE_IC("StoreIC", key);
   }
 
   return Runtime::SetObjectPropertyOrFail(