Revert of [builtins] Properly optimize TypedArray/DataView accessors.

src/crankshaft/hydrogen.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/hydrogen.h"
 
 #include <sstream>
 
 #include "src/allocation-site-scopes.h"
 #include "src/ast/ast-numbering.h"
@@ skipping 8802 matching lines @@
   return TryInline(expr->target(), expr->arguments()->length(),
                    implicit_return_value, expr->id(), expr->ReturnId(),
                    CONSTRUCT_CALL_RETURN, TailCallMode::kDisallow);
 }
 
 bool HOptimizedGraphBuilder::TryInlineGetter(Handle<Object> getter,
                                              Handle<Map> receiver_map,
                                              BailoutId ast_id,
                                              BailoutId return_id) {
   if (TryInlineApiGetter(getter, receiver_map, ast_id)) return true;
-  if (getter->IsJSFunction()) {
-    Handle<JSFunction> getter_function = Handle<JSFunction>::cast(getter);
-    return TryInlineBuiltinGetterCall(getter_function, receiver_map, ast_id) ||
-           TryInline(getter_function, 0, NULL, ast_id, return_id,
-                     GETTER_CALL_RETURN, TailCallMode::kDisallow);
-  }
-  return false;
+  return getter->IsJSFunction() &&
+         TryInline(Handle<JSFunction>::cast(getter), 0, NULL, ast_id, return_id,
+                   GETTER_CALL_RETURN, TailCallMode::kDisallow);
 }
 
 bool HOptimizedGraphBuilder::TryInlineSetter(Handle<Object> setter,
                                              Handle<Map> receiver_map,
                                              BailoutId id,
                                              BailoutId assignment_id,
                                              HValue* implicit_return_value) {
   if (TryInlineApiSetter(setter, receiver_map, id)) return true;
   return setter->IsJSFunction() &&
          TryInline(Handle<JSFunction>::cast(setter), 1, implicit_return_value,
@@ skipping 71 matching lines @@
 bool HOptimizedGraphBuilder::CanInlineArrayResizeOperation(
     Handle<Map> receiver_map) {
   return !receiver_map.is_null() && receiver_map->prototype()->IsJSObject() &&
          receiver_map->instance_type() == JS_ARRAY_TYPE &&
          IsFastElementsKind(receiver_map->elements_kind()) &&
          !receiver_map->is_dictionary_map() && receiver_map->is_extensible() &&
          (!receiver_map->is_prototype_map() || receiver_map->is_stable()) &&
          !IsReadOnlyLengthDescriptor(receiver_map);
 }
 
-bool HOptimizedGraphBuilder::TryInlineBuiltinGetterCall(
-    Handle<JSFunction> function, Handle<Map> receiver_map, BailoutId ast_id) {
-  if (!function->shared()->HasBuiltinFunctionId()) return false;
-  BuiltinFunctionId id = function->shared()->builtin_function_id();
-
-  // Try to inline getter calls like DataView.prototype.byteLength/byteOffset
-  // as operations in the calling function.
-  switch (id) {
-    case kDataViewBuffer: {
-      if (!receiver_map->IsJSDataViewMap()) return false;
-      HObjectAccess access = HObjectAccess::ForMapAndOffset(
-          receiver_map, JSDataView::kBufferOffset);
-      HValue* object = Pop();  // receiver
-      HInstruction* result = New<HLoadNamedField>(object, object, access);
-      ast_context()->ReturnInstruction(result, ast_id);
-      return true;
-    }
-    case kDataViewByteLength:
-    case kDataViewByteOffset: {
-      if (!receiver_map->IsJSDataViewMap()) return false;
-      int offset = (id == kDataViewByteLength) ? JSDataView::kByteLengthOffset
-                                               : JSDataView::kByteOffsetOffset;
-      HObjectAccess access =
-          HObjectAccess::ForMapAndOffset(receiver_map, offset);
-      HValue* object = Pop();  // receiver
-      HValue* checked_object = Add<HCheckArrayBufferNotNeutered>(object);
-      HInstruction* result =
-          New<HLoadNamedField>(object, checked_object, access);
-      ast_context()->ReturnInstruction(result, ast_id);
-      return true;
-    }
-    case kTypedArrayByteLength:
-    case kTypedArrayByteOffset:
-    case kTypedArrayLength: {
-      if (!receiver_map->IsJSTypedArrayMap()) return false;
-      int offset = (id == kTypedArrayLength)
-                       ? JSTypedArray::kLengthOffset
-                       : (id == kTypedArrayByteLength)
-                             ? JSTypedArray::kByteLengthOffset
-                             : JSTypedArray::kByteOffsetOffset;
-      HObjectAccess access =
-          HObjectAccess::ForMapAndOffset(receiver_map, offset);
-      HValue* object = Pop();  // receiver
-      HValue* checked_object = Add<HCheckArrayBufferNotNeutered>(object);
-      HInstruction* result =
-          New<HLoadNamedField>(object, checked_object, access);
-      ast_context()->ReturnInstruction(result, ast_id);
-      return true;
-    }
-    default:
-      return false;
-  }
-}
 
 bool HOptimizedGraphBuilder::TryInlineBuiltinMethodCall(
-    Handle<JSFunction> function, Handle<Map> receiver_map, BailoutId ast_id,
+    Call* expr, Handle<JSFunction> function, Handle<Map> receiver_map,
     int args_count_no_receiver) {
   if (!function->shared()->HasBuiltinFunctionId()) return false;
   BuiltinFunctionId id = function->shared()->builtin_function_id();
   int argument_count = args_count_no_receiver + 1;  // Plus receiver.
 
   if (receiver_map.is_null()) {
     HValue* receiver = environment()->ExpressionStackAt(args_count_no_receiver);
     if (receiver->IsConstant() &&
         HConstant::cast(receiver)->handle(isolate())->IsHeapObject()) {
       receiver_map =
@@ skipping 24 matching lines @@
     }
     case kStringCharCodeAt:
     case kStringCharAt:
       if (argument_count == 2) {
         HValue* index = Pop();
         HValue* string = Pop();
         Drop(1);  // Function.
         HInstruction* char_code =
             BuildStringCharCodeAt(string, index);
         if (id == kStringCharCodeAt) {
-          ast_context()->ReturnInstruction(char_code, ast_id);
+          ast_context()->ReturnInstruction(char_code, expr->id());
           return true;
         }
         AddInstruction(char_code);
         HInstruction* result = NewUncasted<HStringCharFromCode>(char_code);
-        ast_context()->ReturnInstruction(result, ast_id);
+        ast_context()->ReturnInstruction(result, expr->id());
         return true;
       }
       break;
     case kStringFromCharCode:
       if (argument_count == 2) {
         HValue* argument = Pop();
         Drop(2);  // Receiver and function.
         argument = AddUncasted<HForceRepresentation>(
             argument, Representation::Integer32());
         argument->SetFlag(HValue::kTruncatingToInt32);
         HInstruction* result = NewUncasted<HStringCharFromCode>(argument);
-        ast_context()->ReturnInstruction(result, ast_id);
+        ast_context()->ReturnInstruction(result, expr->id());
         return true;
       }
       break;
     case kMathExp:
       if (!FLAG_fast_math) break;
       // Fall through if FLAG_fast_math.
     case kMathRound:
     case kMathFround:
     case kMathFloor:
     case kMathAbs:
     case kMathSqrt:
     case kMathLog:
     case kMathClz32:
       if (argument_count == 2) {
         HValue* argument = Pop();
         Drop(2);  // Receiver and function.
         HInstruction* op = NewUncasted<HUnaryMathOperation>(argument, id);
-        ast_context()->ReturnInstruction(op, ast_id);
+        ast_context()->ReturnInstruction(op, expr->id());
         return true;
       }
       break;
     case kMathPow:
       if (argument_count == 3) {
         HValue* right = Pop();
         HValue* left = Pop();
         Drop(2);  // Receiver and function.
         HInstruction* result = NULL;
         // Use sqrt() if exponent is 0.5 or -0.5.
@@ skipping 10 matching lines @@
             DCHECK(!sqrt->HasObservableSideEffects());
             result = NewUncasted<HDiv>(one, sqrt);
           } else if (exponent == 2.0) {
             result = NewUncasted<HMul>(left, left);
           }
         }
 
         if (result == NULL) {
           result = NewUncasted<HPower>(left, right);
         }
-        ast_context()->ReturnInstruction(result, ast_id);
+        ast_context()->ReturnInstruction(result, expr->id());
         return true;
       }
       break;
     case kMathMax:
     case kMathMin:
       if (argument_count == 3) {
         HValue* right = Pop();
         HValue* left = Pop();
         Drop(2);  // Receiver and function.
         HMathMinMax::Operation op = (id == kMathMin) ? HMathMinMax::kMathMin
                                                      : HMathMinMax::kMathMax;
         HInstruction* result = NewUncasted<HMathMinMax>(left, right, op);
-        ast_context()->ReturnInstruction(result, ast_id);
+        ast_context()->ReturnInstruction(result, expr->id());
         return true;
       }
       break;
     case kMathImul:
       if (argument_count == 3) {
         HValue* right = Pop();
         HValue* left = Pop();
         Drop(2);  // Receiver and function.
         HInstruction* result =
             HMul::NewImul(isolate(), zone(), context(), left, right);
-        ast_context()->ReturnInstruction(result, ast_id);
+        ast_context()->ReturnInstruction(result, expr->id());
         return true;
       }
       break;
     case kArrayPop: {
       if (!CanInlineArrayResizeOperation(receiver_map)) return false;
       ElementsKind elements_kind = receiver_map->elements_kind();
 
       Drop(args_count_no_receiver);
       HValue* result;
       HValue* reduced_length;
@@ skipping 35 matching lines @@
                          elements_kind, STORE);
         Add<HStoreNamedField>(
             checked_object, HObjectAccess::ForArrayLength(elements_kind),
             reduced_length, STORE_TO_INITIALIZED_ENTRY);
 
         if (!ast_context()->IsEffect()) Push(result);
 
         length_checker.End();
       }
       result = ast_context()->IsEffect() ? graph()->GetConstant0() : Top();
-      Add<HSimulate>(ast_id, REMOVABLE_SIMULATE);
+      Add<HSimulate>(expr->id(), REMOVABLE_SIMULATE);
       if (!ast_context()->IsEffect()) Drop(1);
 
       ast_context()->ReturnValue(result);
       return true;
     }
     case kArrayPush: {
       if (!CanInlineArrayResizeOperation(receiver_map)) return false;
       ElementsKind elements_kind = receiver_map->elements_kind();
 
       // If there may be elements accessors in the prototype chain, the fast
@@ skipping 32 matching lines @@
 
         new_size = AddUncasted<HAdd>(length, graph()->GetConstant1());
 
         bool is_array = receiver_map->instance_type() == JS_ARRAY_TYPE;
         HValue* checked_array = Add<HCheckMaps>(array, receiver_map);
         BuildUncheckedMonomorphicElementAccess(
             checked_array, length, value_to_push, is_array, elements_kind,
             STORE, NEVER_RETURN_HOLE, STORE_AND_GROW_NO_TRANSITION);
 
         if (!ast_context()->IsEffect()) Push(new_size);
-        Add<HSimulate>(ast_id, REMOVABLE_SIMULATE);
+        Add<HSimulate>(expr->id(), REMOVABLE_SIMULATE);
         if (!ast_context()->IsEffect()) Drop(1);
       }
 
       ast_context()->ReturnValue(new_size);
       return true;
     }
     case kArrayShift: {
       if (!CanInlineArrayResizeOperation(receiver_map)) return false;
       ElementsKind kind = receiver_map->elements_kind();
 
@@ skipping 93 matching lines @@
             Add<HPushArguments>(receiver);
             result = AddInstruction(NewCallConstantFunction(
                 function, 1, TailCallMode::kDisallow, TailCallMode::kDisallow));
             if (!ast_context()->IsEffect()) Push(result);
           }
           if_inline.End();
         }
         if_lengthiszero.End();
       }
       result = ast_context()->IsEffect() ? graph()->GetConstant0() : Top();
-      Add<HSimulate>(ast_id, REMOVABLE_SIMULATE);
+      Add<HSimulate>(expr->id(), REMOVABLE_SIMULATE);
       if (!ast_context()->IsEffect()) Drop(1);
       ast_context()->ReturnValue(result);
       return true;
     }
     case kArrayIndexOf:
     case kArrayLastIndexOf: {
       if (receiver_map.is_null()) return false;
       if (receiver_map->instance_type() != JS_ARRAY_TYPE) return false;
       if (!receiver_map->prototype()->IsJSObject()) return false;
       ElementsKind kind = receiver_map->elements_kind();
@@ skipping 16 matching lines @@
 
       HValue* search_element = Pop();
       HValue* receiver = Pop();
       Drop(1);  // Drop function.
 
       ArrayIndexOfMode mode = (id == kArrayIndexOf)
           ? kFirstIndexOf : kLastIndexOf;
       HValue* index = BuildArrayIndexOf(receiver, search_element, kind, mode);
 
       if (!ast_context()->IsEffect()) Push(index);
-      Add<HSimulate>(ast_id, REMOVABLE_SIMULATE);
+      Add<HSimulate>(expr->id(), REMOVABLE_SIMULATE);
       if (!ast_context()->IsEffect()) Drop(1);
       ast_context()->ReturnValue(index);
       return true;
     }
     default:
       // Not yet supported for inlining.
       break;
   }
   return false;
 }
@@ skipping 176 matching lines @@
 
 
 void HOptimizedGraphBuilder::HandleIndirectCall(Call* expr, HValue* function,
                                                 int arguments_count) {
   Handle<JSFunction> known_function;
   int args_count_no_receiver = arguments_count - 1;
   if (function->IsConstant() &&
       HConstant::cast(function)->handle(isolate())->IsJSFunction()) {
     known_function =
         Handle<JSFunction>::cast(HConstant::cast(function)->handle(isolate()));
-    if (TryInlineBuiltinMethodCall(known_function, Handle<Map>(), expr->id(),
+    if (TryInlineBuiltinMethodCall(expr, known_function, Handle<Map>(),
                                    args_count_no_receiver)) {
       if (FLAG_trace_inlining) {
         PrintF("Inlining builtin ");
         known_function->ShortPrint();
         PrintF("\n");
       }
       return;
     }
 
     if (TryInlineIndirectCall(known_function, expr, args_count_no_receiver)) {
@@ skipping 380 matching lines @@
       Push(receiver);
 
       Handle<JSFunction> known_function = Handle<JSFunction>::cast(
           HConstant::cast(function)->handle(isolate()));
       expr->set_target(known_function);
 
       if (TryIndirectCall(expr)) return;
       CHECK_ALIVE(VisitExpressions(expr->arguments()));
 
       Handle<Map> map = maps->length() == 1 ? maps->first() : Handle<Map>();
-      if (TryInlineBuiltinMethodCall(known_function, map, expr->id(),
+      if (TryInlineBuiltinMethodCall(expr, known_function, map,
                                      expr->arguments()->length())) {
         if (FLAG_trace_inlining) {
           PrintF("Inlining builtin ");
           known_function->ShortPrint();
           PrintF("\n");
         }
         return;
       }
       if (TryInlineApiMethodCall(expr, receiver, maps)) return;
 
@@ skipping 3721 matching lines @@
     isolate()->GetHTracer()->TraceHydrogen(name(), graph_);
   }
 
 #ifdef DEBUG
   graph_->Verify(false);  // No full verify.
 #endif
 }
 
 }  // namespace internal
 }  // namespace v8