Move (uppercase) JS builtins from js builtins object to native context.

src/compiler/interpreter-assembler.cc

 // Copyright 2015 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/compiler/interpreter-assembler.h"
 
 #include <ostream>
 
 #include "src/compiler/graph.h"
 #include "src/compiler/instruction-selector.h"
@@ skipping 177 matching lines @@
   return raw_assembler_->WordSar(value, SmiShiftBitsConstant());
 }
 
 
 Node* InterpreterAssembler::LoadObjectField(Node* object, int offset) {
   return raw_assembler_->Load(kMachAnyTagged, object,
                               IntPtrConstant(offset - kHeapObjectTag));
 }
 
 
+Node* InterpreterAssembler::LoadContextSlot(Node* context, int slot_index) {
+  return raw_assembler_->Load(kMachAnyTagged, context,
+                              IntPtrConstant(Context::SlotOffset(slot_index)));
+}
+
+
 Node* InterpreterAssembler::LoadContextSlot(int slot_index) {
-  return raw_assembler_->Load(kMachAnyTagged, ContextTaggedPointer(),
-                              IntPtrConstant(Context::SlotOffset(slot_index)));
+  return LoadContextSlot(ContextTaggedPointer(), slot_index);
 }
 
 
-Node* InterpreterAssembler::CallJSBuiltin(Builtins::JavaScript builtin,
-                                          Node* receiver, Node** js_args,
-                                          int js_arg_count) {
+Node* InterpreterAssembler::CallJSBuiltin(int context_index, Node* receiver,
+                                          Node** js_args, int js_arg_count) {
   Node* global_object = LoadContextSlot(Context::GLOBAL_OBJECT_INDEX);
-  Node* builtins_object =
-      LoadObjectField(global_object, GlobalObject::kBuiltinsOffset);
-  Node* function = LoadObjectField(
-      builtins_object, JSBuiltinsObject::OffsetOfFunctionWithId(builtin));
+  Node* native_context =
+      LoadObjectField(global_object, GlobalObject::kNativeContextOffset);
+  Node* function = LoadContextSlot(native_context, context_index);
   Node* context = LoadObjectField(function, JSFunction::kContextOffset);
 
   int index = 0;
   Node** args = zone()->NewArray<Node*>(js_arg_count + 2);
   args[index++] = receiver;
   for (int i = 0; i < js_arg_count; i++) {
     args[index++] = js_args[i];
   }
   args[index++] = context;
 
   CallDescriptor* descriptor = Linkage::GetJSCallDescriptor(
       zone(), false, js_arg_count + 1, CallDescriptor::kNoFlags);
   return raw_assembler_->CallN(descriptor, function, args);
 }
 
 
-Node* InterpreterAssembler::CallJSBuiltin(Builtins::JavaScript builtin,
-                                          Node* receiver) {
-  return CallJSBuiltin(builtin, receiver, nullptr, 0);
+Node* InterpreterAssembler::CallJSBuiltin(int context_index, Node* receiver) {
+  return CallJSBuiltin(context_index, receiver, nullptr, 0);
 }
 
 
-Node* InterpreterAssembler::CallJSBuiltin(Builtins::JavaScript builtin,
-                                          Node* receiver, Node* arg1) {
-  return CallJSBuiltin(builtin, receiver, &arg1, 1);
+Node* InterpreterAssembler::CallJSBuiltin(int context_index, Node* receiver,
+                                          Node* arg1) {
+  return CallJSBuiltin(context_index, receiver, &arg1, 1);
 }
 
 
 void InterpreterAssembler::Return() {
   Node* exit_trampoline_code_object =
       HeapConstant(Unique<HeapObject>::CreateImmovable(
           isolate()->builtins()->InterpreterExitTrampoline()));
   // If the order of the parameters you need to change the call signature below.
   STATIC_ASSERT(0 == Linkage::kInterpreterAccumulatorParameter);
   STATIC_ASSERT(1 == Linkage::kInterpreterRegisterFileParameter);
@@ skipping 81 matching lines @@
   return raw_assembler_->schedule();
 }
 
 
 Zone* InterpreterAssembler::zone() { return raw_assembler_->zone(); }
 
 
 }  // namespace interpreter
 }  // namespace internal
 }  // namespace v8