Revert of [builtins] Move StringIncludes to a builtin.

src/builtins/builtins-string.cc

 // Copyright 2016 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/builtins/builtins.h"
 #include "src/builtins/builtins-utils.h"
 
 #include "src/code-factory.h"
 
 namespace v8 {
@@ skipping 763 matching lines @@
 
     assembler->Bind(&if_positioninbounds);
   }
 
   // Load the character at the {position} from the {receiver}.
   Node* value = assembler->StringCharCodeAt(receiver, position);
   Node* result = assembler->SmiFromWord32(value);
   assembler->Return(result);
 }
 
-// ES6 section 21.1.3.7
-// String.prototype.includes ( searchString [ , position ] )
-BUILTIN(StringPrototypeIncludes) {
-  HandleScope handle_scope(isolate);
-  TO_THIS_STRING(str, "String.prototype.includes");
-
-  Handle<Object> search = args.atOrUndefined(isolate, 1);
-  if (search->IsObject()) {
-    Handle<Symbol> match_name = isolate->factory()->match_symbol();
-    Handle<Object> match_property;
-    ASSIGN_RETURN_FAILURE_ON_EXCEPTION(isolate, match_property,
-                                       Object::GetProperty(search, match_name));
-    if (!match_property->IsUndefined(isolate) &&
-        match_property->BooleanValue()) {
-      THROW_NEW_ERROR_RETURN_FAILURE(
-          isolate, NewTypeError(MessageTemplate::kFirstArgumentNotRegExp,
-                                isolate->factory()->NewStringFromStaticChars(
-                                    "String.prototype.includes")));
-    }
-  }
-  Handle<String> search_string;
-  ASSIGN_RETURN_FAILURE_ON_EXCEPTION(isolate, search_string,
-                                     Object::ToString(isolate, search));
-  Handle<Object> position;
-  ASSIGN_RETURN_FAILURE_ON_EXCEPTION(
-      isolate, position,
-      Object::ToInteger(isolate, args.atOrUndefined(isolate, 2)));
-
-  double index = std::max(position->Number(), 0.0);
-  index = std::min(index, static_cast<double>(str->length()));
-
-  int index_in_str = String::IndexOf(isolate, str, search_string,
-                                     static_cast<uint32_t>(index));
-  return *isolate->factory()->ToBoolean(index_in_str != -1);
-}
-
 // ES6 section 21.1.3.8 String.prototype.indexOf ( searchString [ , position ] )
 BUILTIN(StringPrototypeIndexOf) {
   HandleScope handle_scope(isolate);
 
   return String::IndexOf(isolate, args.receiver(),
                          args.atOrUndefined(isolate, 1),
                          args.atOrUndefined(isolate, 2));
 }
 
 // ES6 section 21.1.3.9
@@ skipping 556 matching lines @@
         Runtime::kThrowIncompatibleMethodReceiver, context,
         assembler->HeapConstant(assembler->factory()->NewStringFromAsciiChecked(
             "String Iterator.prototype.next", TENURED)),
         iterator);
     assembler->Return(result);  // Never reached.
   }
 }
 
 }  // namespace internal
 }  // namespace v8