Revert of [KeyedLoadIC] Support Smi "handlers" for element loads

src/ic/handler-compiler.cc

Index: src/ic/handler-compiler.cc
diff --git a/src/ic/handler-compiler.cc b/src/ic/handler-compiler.cc
index b6b81def540278a1a2fa89c337d6f2dc1c1c1396..a1d1467ab1f3600d1994d7d62c4380db4408ccf2 100644
--- a/src/ic/handler-compiler.cc
+++ b/src/ic/handler-compiler.cc
@@ -6,7 +6,6 @@
 
 #include "src/field-type.h"
 #include "src/ic/call-optimization.h"
-#include "src/ic/handler-configuration.h"
 #include "src/ic/ic-inl.h"
 #include "src/ic/ic.h"
 #include "src/isolate-inl.h"
@@ -578,7 +577,7 @@
 #undef __
 
 // static
-Handle<Object> ElementHandlerCompiler::GetKeyedLoadHandler(
+Handle<Code> ElementHandlerCompiler::GetKeyedLoadHandler(
     Handle<Map> receiver_map, Isolate* isolate) {
   if (receiver_map->has_indexed_interceptor() &&
       !receiver_map->GetIndexedInterceptor()->getter()->IsUndefined(isolate) &&
@@ -611,18 +610,10 @@
   bool convert_hole_to_undefined =
       is_js_array && elements_kind == FAST_HOLEY_ELEMENTS &&
       *receiver_map == isolate->get_initial_js_array_map(elements_kind);
-  if (FLAG_tf_load_ic_stub) {
-    int config = KeyedLoadElementsKind::encode(elements_kind) |
-                 KeyedLoadConvertHole::encode(convert_hole_to_undefined) |
-                 KeyedLoadIsJsArray::encode(is_js_array) |
-                 LoadHandlerTypeBit::encode(kLoadICHandlerForElements);
-    return handle(Smi::FromInt(config), isolate);
-  } else {
-    TRACE_HANDLER_STATS(isolate, KeyedLoadIC_LoadFastElementStub);
-    return LoadFastElementStub(isolate, is_js_array, elements_kind,
-                               convert_hole_to_undefined)
-        .GetCode();
-  }
+  TRACE_HANDLER_STATS(isolate, KeyedLoadIC_LoadFastElementStub);
+  return LoadFastElementStub(isolate, is_js_array, elements_kind,
+                             convert_hole_to_undefined)
+      .GetCode();
 }
 
 void ElementHandlerCompiler::CompileElementHandlers(