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

src/contexts.h

 // Copyright 2012 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.
 
 #ifndef V8_CONTEXTS_H_
 #define V8_CONTEXTS_H_
 
 #include "src/heap/heap.h"
 #include "src/objects.h"
 
@@ skipping 72 matching lines @@
   V(REFLECT_APPLY_INDEX, JSFunction, reflect_apply)                       \
   V(REFLECT_CONSTRUCT_INDEX, JSFunction, reflect_construct)               \
   V(SPREAD_ARGUMENTS_INDEX, JSFunction, spread_arguments)                 \
   V(SPREAD_ITERABLE_INDEX, JSFunction, spread_iterable)                   \
   V(TO_LENGTH_FUN_INDEX, JSFunction, to_length_fun)                       \
   V(TO_NAME_INDEX, JSFunction, to_name)                                   \
   V(TO_NUMBER_FUN_INDEX, JSFunction, to_number_fun)                       \
   V(TO_PRIMITIVE_INDEX, JSFunction, to_primitive)                         \
   V(TO_STRING_FUN_INDEX, JSFunction, to_string_fun)
 
+
+#define NATIVE_CONTEXT_JS_BUILTINS(V)                                       \
+  V(ADD_BUILTIN_INDEX, JSFunction, add_builtin)                             \
+  V(ADD_STRONG_BUILTIN_INDEX, JSFunction, add_strong_builtin)               \
+  V(APPLY_PREPARE_BUILTIN_INDEX, JSFunction, apply_prepare_builtin)         \
+  V(BIT_AND_BUILTIN_INDEX, JSFunction, bit_and_builtin)                     \
+  V(BIT_AND_STRONG_BUILTIN_INDEX, JSFunction, bit_and_strong_builtin)       \
+  V(BIT_OR_BUILTIN_INDEX, JSFunction, bit_or_builtin)                       \
+  V(BIT_OR_STRONG_BUILTIN_INDEX, JSFunction, bit_or_strong_builtin)         \
+  V(BIT_XOR_BUILTIN_INDEX, JSFunction, bit_xor_builtin)                     \
+  V(BIT_XOR_STRONG_BUILTIN_INDEX, JSFunction, bit_xor_strong_builtin)       \
+  V(CALL_FUNCTION_PROXY_AS_CONSTRUCTOR_BUILTIN_INDEX, JSFunction,           \
+    call_function_proxy_as_constructor_builtin)                             \
+  V(CALL_FUNCTION_PROXY_BUILTIN_INDEX, JSFunction,                          \
+    call_function_proxy_builtin)                                            \
+  V(CALL_NON_FUNCTION_AS_CONSTRUCTOR_BUILTIN_INDEX, JSFunction,             \
+    call_non_function_as_constructor_builtin)                               \
+  V(CALL_NON_FUNCTION_BUILTIN_INDEX, JSFunction, call_non_function_builtin) \
+  V(COMPARE_BUILTIN_INDEX, JSFunction, compare_builtin)                     \
+  V(COMPARE_STRONG_BUILTIN_INDEX, JSFunction, compare_strong_builtin)       \
+  V(CONCAT_ITERABLE_TO_ARRAY_BUILTIN_INDEX, JSFunction,                     \
+    concat_iterable_to_array_builtin)                                       \
+  V(DIV_BUILTIN_INDEX, JSFunction, div_builtin)                             \
+  V(DIV_STRONG_BUILTIN_INDEX, JSFunction, div_strong_builtin)               \
+  V(EQUALS_BUILTIN_INDEX, JSFunction, equals_builtin)                       \
+  V(IN_BUILTIN_INDEX, JSFunction, in_builtin)                               \
+  V(MOD_BUILTIN_INDEX, JSFunction, mod_builtin)                             \
+  V(MOD_STRONG_BUILTIN_INDEX, JSFunction, mod_strong_builtin)               \
+  V(MUL_BUILTIN_INDEX, JSFunction, mul_builtin)                             \
+  V(MUL_STRONG_BUILTIN_INDEX, JSFunction, mul_strong_builtin)               \
+  V(REFLECT_APPLY_PREPARE_BUILTIN_INDEX, JSFunction,                        \
+    reflect_apply_prepare_builtin)                                          \
+  V(REFLECT_CONSTRUCT_PREPARE_BUILTIN_INDEX, JSFunction,                    \
+    reflect_construct_prepare_builtin)                                      \
+  V(SAR_BUILTIN_INDEX, JSFunction, sar_builtin)                             \
+  V(SAR_STRONG_BUILTIN_INDEX, JSFunction, sar_strong_builtin)               \
+  V(SHL_BUILTIN_INDEX, JSFunction, shl_builtin)                             \
+  V(SHL_STRONG_BUILTIN_INDEX, JSFunction, shl_strong_builtin)               \
+  V(SHR_BUILTIN_INDEX, JSFunction, shr_builtin)                             \
+  V(SHR_STRONG_BUILTIN_INDEX, JSFunction, shr_strong_builtin)               \
+  V(STACK_OVERFLOW_BUILTIN_INDEX, JSFunction, stack_overflow_builtin)       \
+  V(STRING_ADD_LEFT_BUILTIN_INDEX, JSFunction, string_add_left_builtin)     \
+  V(STRING_ADD_RIGHT_BUILTIN_INDEX, JSFunction, string_add_right_builtin)   \
+  V(SUB_BUILTIN_INDEX, JSFunction, sub_builtin)                             \
+  V(SUB_STRONG_BUILTIN_INDEX, JSFunction, sub_strong_builtin)               \
+  V(TO_NAME_BUILTIN_INDEX, JSFunction, to_name_builtin)                     \
+  V(TO_NUMBER_BUILTIN_INDEX, JSFunction, to_number_builtin)                 \
+  V(TO_STRING_BUILTIN_INDEX, JSFunction, to_string_builtin)
+
+
 #define NATIVE_CONTEXT_IMPORTED_FIELDS(V)                                     \
   V(ARRAY_CONCAT_INDEX, JSFunction, array_concat)                             \
   V(ARRAY_POP_INDEX, JSFunction, array_pop)                                   \
   V(ARRAY_PUSH_INDEX, JSFunction, array_push)                                 \
   V(ARRAY_SHIFT_INDEX, JSFunction, array_shift)                               \
   V(ARRAY_SPLICE_INDEX, JSFunction, array_splice)                             \
   V(ARRAY_SLICE_INDEX, JSFunction, array_slice)                               \
   V(ARRAY_UNSHIFT_INDEX, JSFunction, array_unshift)                           \
   V(ARRAY_VALUES_ITERATOR_INDEX, JSFunction, array_values_iterator)           \
   V(CREATE_DATE_FUN_INDEX, JSFunction, create_date_fun)                       \
@@ skipping 42 matching lines @@
   V(SET_DELETE_METHOD_INDEX, JSFunction, set_delete)                          \
   V(SET_FROM_ARRAY_INDEX, JSFunction, set_from_array)                         \
   V(SET_HAS_METHOD_INDEX, JSFunction, set_has)                                \
   V(STACK_OVERFLOW_BOILERPLATE_INDEX, JSObject, stack_overflow_boilerplate)   \
   V(SYNTAX_ERROR_FUNCTION_INDEX, JSFunction, syntax_error_function)           \
   V(TO_COMPLETE_PROPERTY_DESCRIPTOR_INDEX, JSFunction,                        \
     to_complete_property_descriptor)                                          \
   V(TO_DETAIL_STRING_FUN_INDEX, JSFunction, to_detail_string_fun)             \
   V(TO_INTEGER_FUN_INDEX, JSFunction, to_integer_fun)                         \
   V(TYPE_ERROR_FUNCTION_INDEX, JSFunction, type_error_function)               \
-  V(URI_ERROR_FUNCTION_INDEX, JSFunction, uri_error_function)
+  V(URI_ERROR_FUNCTION_INDEX, JSFunction, uri_error_function)                 \
+  NATIVE_CONTEXT_JS_BUILTINS(V)

[Michael Starzinger, 2015/08/26 14:16:42]

Is there a reason we are adding this to the NATIVE_CONTEXT_IMPORTED_FIELDS
instead of the NATIVE_CONTEXT_FIELDS below?

 
 #define NATIVE_CONTEXT_FIELDS(V)                                               \
   V(GLOBAL_PROXY_INDEX, JSObject, global_proxy_object)                         \
   V(EMBEDDER_DATA_INDEX, FixedArray, embedder_data)                            \
   /* Below is alpha-sorted */                                                  \
   V(ALLOW_CODE_GEN_FROM_STRINGS_INDEX, Object, allow_code_gen_from_strings)    \
   V(ARRAY_BUFFER_FUN_INDEX, JSFunction, array_buffer_fun)                      \
   V(ARRAY_BUFFER_MAP_INDEX, Map, array_buffer_map)                             \
   V(ARRAY_FUNCTION_INDEX, JSFunction, array_function)                          \
   V(BOOL16X8_FUNCTION_INDEX, JSFunction, bool16x8_function)                    \
@@ skipping 325 matching lines @@
   void SetOptimizedCodeListHead(Object* head);
   Object* OptimizedCodeListHead();
   void SetDeoptimizedCodeListHead(Object* head);
   Object* DeoptimizedCodeListHead();
 
   Handle<Object> ErrorMessageForCodeGenerationFromStrings();
 
   static int ImportedFieldIndexForName(Handle<String> name);
   static int IntrinsicIndexForName(Handle<String> name);
 
+  static bool IsJSBuiltin(Handle<Context> native_context,
+                          Handle<JSFunction> function);
+
 #define NATIVE_CONTEXT_FIELD_ACCESSORS(index, type, name) \
   void  set_##name(type* value) {                         \
     DCHECK(IsNativeContext());                            \
     set(index, value);                                    \
   }                                                       \
   bool is_##name(type* value) {                           \
     DCHECK(IsNativeContext());                            \
     return type::cast(get(index)) == value;               \
   }                                                       \
   type* name() {                                          \
@@ skipping 78 matching lines @@
   static bool IsBootstrappingOrGlobalObject(Isolate* isolate, Object* object);
 #endif
 
   STATIC_ASSERT(kHeaderSize == Internals::kContextHeaderSize);
   STATIC_ASSERT(EMBEDDER_DATA_INDEX == Internals::kContextEmbedderDataIndex);
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_CONTEXTS_H_