diff options
author | Ben Noordhuis <info@bnoordhuis.nl> | 2014-03-31 14:38:28 +0200 |
---|---|---|
committer | Fedor Indutny <fedor@indutny.com> | 2014-04-02 00:05:24 +0400 |
commit | 67e078094b53861a5aa7e9354e33487d0bd4f73b (patch) | |
tree | 09a706adee1ddb59c1507ee3320de9cb6896135b /deps/v8/src/contexts.h | |
parent | f984555d47298cfb01b3e55c2861066379306fc3 (diff) | |
download | android-node-v8-67e078094b53861a5aa7e9354e33487d0bd4f73b.tar.gz android-node-v8-67e078094b53861a5aa7e9354e33487d0bd4f73b.tar.bz2 android-node-v8-67e078094b53861a5aa7e9354e33487d0bd4f73b.zip |
deps: upgrade v8 to 3.25.30
Diffstat (limited to 'deps/v8/src/contexts.h')
-rw-r--r-- | deps/v8/src/contexts.h | 81 |
1 files changed, 46 insertions, 35 deletions
diff --git a/deps/v8/src/contexts.h b/deps/v8/src/contexts.h index bd6c6a2bbc..6ba9b3ed7d 100644 --- a/deps/v8/src/contexts.h +++ b/deps/v8/src/contexts.h @@ -135,17 +135,19 @@ enum BindingFlags { V(FLOAT64_ARRAY_FUN_INDEX, JSFunction, float64_array_fun) \ V(UINT8_CLAMPED_ARRAY_FUN_INDEX, JSFunction, uint8_clamped_array_fun) \ V(DATA_VIEW_FUN_INDEX, JSFunction, data_view_fun) \ - V(FUNCTION_MAP_INDEX, Map, function_map) \ - V(STRICT_MODE_FUNCTION_MAP_INDEX, Map, strict_mode_function_map) \ - V(FUNCTION_WITHOUT_PROTOTYPE_MAP_INDEX, Map, function_without_prototype_map) \ - V(STRICT_MODE_FUNCTION_WITHOUT_PROTOTYPE_MAP_INDEX, Map, \ - strict_mode_function_without_prototype_map) \ + V(SLOPPY_FUNCTION_MAP_INDEX, Map, sloppy_function_map) \ + V(STRICT_FUNCTION_MAP_INDEX, Map, strict_function_map) \ + V(SLOPPY_FUNCTION_WITHOUT_PROTOTYPE_MAP_INDEX, Map, \ + sloppy_function_without_prototype_map) \ + V(STRICT_FUNCTION_WITHOUT_PROTOTYPE_MAP_INDEX, Map, \ + strict_function_without_prototype_map) \ V(REGEXP_RESULT_MAP_INDEX, Map, regexp_result_map)\ - V(ARGUMENTS_BOILERPLATE_INDEX, JSObject, arguments_boilerplate) \ + V(SLOPPY_ARGUMENTS_BOILERPLATE_INDEX, JSObject, \ + sloppy_arguments_boilerplate) \ V(ALIASED_ARGUMENTS_BOILERPLATE_INDEX, JSObject, \ aliased_arguments_boilerplate) \ - V(STRICT_MODE_ARGUMENTS_BOILERPLATE_INDEX, JSObject, \ - strict_mode_arguments_boilerplate) \ + V(STRICT_ARGUMENTS_BOILERPLATE_INDEX, JSObject, \ + strict_arguments_boilerplate) \ V(MESSAGE_LISTENERS_INDEX, JSObject, message_listeners) \ V(MAKE_MESSAGE_FUN_INDEX, JSFunction, make_message_fun) \ V(GET_STACK_TRACE_LINE_INDEX, JSFunction, get_stack_trace_line_fun) \ @@ -160,13 +162,19 @@ enum BindingFlags { V(SCRIPT_FUNCTION_INDEX, JSFunction, script_function) \ V(OPAQUE_REFERENCE_FUNCTION_INDEX, JSFunction, opaque_reference_function) \ V(CONTEXT_EXTENSION_FUNCTION_INDEX, JSFunction, context_extension_function) \ - V(OUT_OF_MEMORY_INDEX, Object, out_of_memory) \ V(MAP_CACHE_INDEX, Object, map_cache) \ V(EMBEDDER_DATA_INDEX, FixedArray, embedder_data) \ V(ALLOW_CODE_GEN_FROM_STRINGS_INDEX, Object, allow_code_gen_from_strings) \ V(ERROR_MESSAGE_FOR_CODE_GEN_FROM_STRINGS_INDEX, Object, \ error_message_for_code_gen_from_strings) \ V(RUN_MICROTASKS_INDEX, JSFunction, run_microtasks) \ + V(ENQUEUE_EXTERNAL_MICROTASK_INDEX, JSFunction, enqueue_external_microtask) \ + V(IS_PROMISE_INDEX, JSFunction, is_promise) \ + V(PROMISE_CREATE_INDEX, JSFunction, promise_create) \ + V(PROMISE_RESOLVE_INDEX, JSFunction, promise_resolve) \ + V(PROMISE_REJECT_INDEX, JSFunction, promise_reject) \ + V(PROMISE_CHAIN_INDEX, JSFunction, promise_chain) \ + V(PROMISE_CATCH_INDEX, JSFunction, promise_catch) \ V(TO_COMPLETE_PROPERTY_DESCRIPTOR_INDEX, JSFunction, \ to_complete_property_descriptor) \ V(DERIVED_HAS_TRAP_INDEX, JSFunction, derived_has_trap) \ @@ -179,9 +187,8 @@ enum BindingFlags { observers_begin_perform_splice) \ V(OBSERVERS_END_SPLICE_INDEX, JSFunction, \ observers_end_perform_splice) \ - V(GENERATOR_FUNCTION_MAP_INDEX, Map, generator_function_map) \ - V(STRICT_MODE_GENERATOR_FUNCTION_MAP_INDEX, Map, \ - strict_mode_generator_function_map) \ + V(SLOPPY_GENERATOR_FUNCTION_MAP_INDEX, Map, sloppy_generator_function_map) \ + V(STRICT_GENERATOR_FUNCTION_MAP_INDEX, Map, strict_generator_function_map) \ V(GENERATOR_OBJECT_PROTOTYPE_MAP_INDEX, Map, \ generator_object_prototype_map) \ V(GENERATOR_RESULT_MAP_INDEX, Map, generator_result_map) @@ -225,8 +232,11 @@ enum BindingFlags { // In addition, function contexts may have statically allocated context slots // to store local variables/functions that are accessed from inner functions // (via static context addresses) or through 'eval' (dynamic context lookups). -// Finally, the native context contains additional slots for fast access to -// native properties. +// The native context contains additional slots for fast access to native +// properties. +// +// Finally, with Harmony scoping, the JSFunction representing a top level +// script will have the GlobalContext rather than a FunctionContext. class Context: public FixedArray { public: @@ -255,14 +265,14 @@ class Context: public FixedArray { // These slots are only in native contexts. GLOBAL_PROXY_INDEX = MIN_CONTEXT_SLOTS, SECURITY_TOKEN_INDEX, - ARGUMENTS_BOILERPLATE_INDEX, + SLOPPY_ARGUMENTS_BOILERPLATE_INDEX, ALIASED_ARGUMENTS_BOILERPLATE_INDEX, - STRICT_MODE_ARGUMENTS_BOILERPLATE_INDEX, + STRICT_ARGUMENTS_BOILERPLATE_INDEX, REGEXP_RESULT_MAP_INDEX, - FUNCTION_MAP_INDEX, - STRICT_MODE_FUNCTION_MAP_INDEX, - FUNCTION_WITHOUT_PROTOTYPE_MAP_INDEX, - STRICT_MODE_FUNCTION_WITHOUT_PROTOTYPE_MAP_INDEX, + SLOPPY_FUNCTION_MAP_INDEX, + STRICT_FUNCTION_MAP_INDEX, + SLOPPY_FUNCTION_WITHOUT_PROTOTYPE_MAP_INDEX, + STRICT_FUNCTION_WITHOUT_PROTOTYPE_MAP_INDEX, INITIAL_OBJECT_PROTOTYPE_INDEX, INITIAL_ARRAY_PROTOTYPE_INDEX, BOOLEAN_FUNCTION_INDEX, @@ -318,6 +328,13 @@ class Context: public FixedArray { ALLOW_CODE_GEN_FROM_STRINGS_INDEX, ERROR_MESSAGE_FOR_CODE_GEN_FROM_STRINGS_INDEX, RUN_MICROTASKS_INDEX, + ENQUEUE_EXTERNAL_MICROTASK_INDEX, + IS_PROMISE_INDEX, + PROMISE_CREATE_INDEX, + PROMISE_RESOLVE_INDEX, + PROMISE_REJECT_INDEX, + PROMISE_CHAIN_INDEX, + PROMISE_CATCH_INDEX, TO_COMPLETE_PROPERTY_DESCRIPTOR_INDEX, DERIVED_HAS_TRAP_INDEX, DERIVED_GET_TRAP_INDEX, @@ -327,8 +344,8 @@ class Context: public FixedArray { OBSERVERS_ENQUEUE_SPLICE_INDEX, OBSERVERS_BEGIN_SPLICE_INDEX, OBSERVERS_END_SPLICE_INDEX, - GENERATOR_FUNCTION_MAP_INDEX, - STRICT_MODE_GENERATOR_FUNCTION_MAP_INDEX, + SLOPPY_GENERATOR_FUNCTION_MAP_INDEX, + STRICT_GENERATOR_FUNCTION_MAP_INDEX, GENERATOR_OBJECT_PROTOTYPE_MAP_INDEX, GENERATOR_RESULT_MAP_INDEX, @@ -422,12 +439,6 @@ class Context: public FixedArray { return map == map->GetHeap()->global_context_map(); } - // Tells whether the native context is marked with out of memory. - inline bool has_out_of_memory(); - - // Mark the native context with out of memory. - inline void mark_out_of_memory(); - // A native context holds a list of all functions with optimized code. void AddOptimizedFunction(JSFunction* function); void RemoveOptimizedFunction(JSFunction* function); @@ -488,14 +499,14 @@ class Context: public FixedArray { return kHeaderSize + index * kPointerSize - kHeapObjectTag; } - static int FunctionMapIndex(LanguageMode language_mode, bool is_generator) { + static int FunctionMapIndex(StrictMode strict_mode, bool is_generator) { return is_generator - ? (language_mode == CLASSIC_MODE - ? GENERATOR_FUNCTION_MAP_INDEX - : STRICT_MODE_GENERATOR_FUNCTION_MAP_INDEX) - : (language_mode == CLASSIC_MODE - ? FUNCTION_MAP_INDEX - : STRICT_MODE_FUNCTION_MAP_INDEX); + ? (strict_mode == SLOPPY + ? SLOPPY_GENERATOR_FUNCTION_MAP_INDEX + : STRICT_GENERATOR_FUNCTION_MAP_INDEX) + : (strict_mode == SLOPPY + ? SLOPPY_FUNCTION_MAP_INDEX + : STRICT_FUNCTION_MAP_INDEX); } static const int kSize = kHeaderSize + NATIVE_CONTEXT_SLOTS * kPointerSize; |