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

test/unittests/compiler/interpreter-assembler-unittest.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 "test/unittests/compiler/interpreter-assembler-unittest.h"
 
 #include "src/compiler/graph.h"
 #include "src/compiler/node.h"
 #include "src/unique.h"
 #include "test/unittests/compiler/compiler-test-utils.h"
@@ skipping 255 matching lines @@
 }
 
 
 TARGET_TEST_F(InterpreterAssemblerTest, LoadContextSlot) {
   TRACED_FOREACH(interpreter::Bytecode, bytecode, kBytecodes) {
     InterpreterAssemblerForTest m(this, bytecode);
     Node* load_context = m.LoadContextSlot(22);
     EXPECT_THAT(load_context,
                 m.IsLoad(kMachAnyTagged,
                          IsParameter(Linkage::kInterpreterContextParameter),
                          IsIntPtrConstant(Context::SlotOffset(22))));

[rmcilroy, 2015/08/27 08:37:16]

nit - could you add a test for the new m.LoadContextSlot(Node* context, int
slot_index) method you added here please.

   }
 }
 
 
 TARGET_TEST_F(InterpreterAssemblerTest, LoadObjectField) {
   TRACED_FOREACH(interpreter::Bytecode, bytecode, kBytecodes) {
     InterpreterAssemblerForTest m(this, bytecode);
     Node* object = m.IntPtrConstant(0xdeadbeef);
     int offset = 16;
     Node* load_field = m.LoadObjectField(object, offset);
     EXPECT_THAT(load_field,
                 m.IsLoad(kMachAnyTagged, object,
                          IsIntPtrConstant(offset - kHeapObjectTag)));
   }
 }
 
 
 TARGET_TEST_F(InterpreterAssemblerTest, CallJSBuiltin) {
   TRACED_FOREACH(interpreter::Bytecode, bytecode, kBytecodes) {
     InterpreterAssemblerForTest m(this, bytecode);
     Node* receiver = m.IntPtrConstant(1234);
-    Node* call_js_builtin_0 = m.CallJSBuiltin(Builtins::SUB, receiver);
+    Node* call_js_builtin_0 =
+        m.CallJSBuiltin(Context::SUB_BUILTIN_INDEX, receiver);
 
     Matcher<Node*> load_globals_matcher = m.IsLoad(
         kMachAnyTagged, IsParameter(Linkage::kInterpreterContextParameter),
         IsIntPtrConstant(Context::SlotOffset(Context::GLOBAL_OBJECT_INDEX)));
-    Matcher<Node*> load_builtins_matcher = m.IsLoad(
+    Matcher<Node*> load_native_context_matcher = m.IsLoad(
         kMachAnyTagged, load_globals_matcher,
-        IsIntPtrConstant(GlobalObject::kBuiltinsOffset - kHeapObjectTag));
-    Matcher<Node*> function_matcher =
-        m.IsLoad(kMachAnyTagged, load_builtins_matcher,
-                 IsIntPtrConstant(
-                     JSBuiltinsObject::OffsetOfFunctionWithId(Builtins::SUB) -
-                     kHeapObjectTag));
+        IsIntPtrConstant(GlobalObject::kNativeContextOffset - kHeapObjectTag));
+    Matcher<Node*> function_matcher = m.IsLoad(
+        kMachAnyTagged, load_native_context_matcher,
+        IsIntPtrConstant(Context::SlotOffset(Context::SUB_BUILTIN_INDEX)));
     Matcher<Node*> context_matcher =
         m.IsLoad(kMachAnyTagged, function_matcher,
                  IsIntPtrConstant(JSFunction::kContextOffset - kHeapObjectTag));
     EXPECT_THAT(call_js_builtin_0,
                 IsCall(_, function_matcher, receiver, context_matcher,
                        m.graph()->start(), m.graph()->start()));
 
     Node* arg1 = m.Int32Constant(0xabcd);
-    Node* call_js_builtin_1 = m.CallJSBuiltin(Builtins::SUB, receiver, arg1);
+    Node* call_js_builtin_1 =
+        m.CallJSBuiltin(Context::SUB_BUILTIN_INDEX, receiver, arg1);
     EXPECT_THAT(call_js_builtin_1,
                 IsCall(_, function_matcher, receiver, arg1, context_matcher,
                        m.graph()->start(), m.graph()->start()));
   }
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8