diff options
author | Chris Dickinson <christopher.s.dickinson@gmail.com> | 2015-05-05 13:48:55 -0700 |
---|---|---|
committer | Rod Vagg <rod@vagg.org> | 2015-08-04 11:56:09 -0700 |
commit | d58e780504bdba6c5897c48428fd984c5b5f96fe (patch) | |
tree | 033f1568ae3f9f077aceb843b42eb1ed1739ce0f /deps/v8/src/contexts.h | |
parent | 21d31c08e7d0b6865e52452750b20b05e6dca443 (diff) | |
download | node-new-d58e780504bdba6c5897c48428fd984c5b5f96fe.tar.gz |
deps: update v8 to 4.3.61.21
* @indutny's SealHandleScope patch (484bebc38319fc7c622478037922ad73b2edcbf9)
has been cherry picked onto the top of V8 to make it compile.
* There's some test breakage in contextify.
* This was merged at the request of the TC.
PR-URL: https://github.com/iojs/io.js/pull/1632
Diffstat (limited to 'deps/v8/src/contexts.h')
-rw-r--r-- | deps/v8/src/contexts.h | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/deps/v8/src/contexts.h b/deps/v8/src/contexts.h index 3d34e0ec77..3b4b7992c0 100644 --- a/deps/v8/src/contexts.h +++ b/deps/v8/src/contexts.h @@ -125,10 +125,12 @@ enum BindingFlags { V(SLOPPY_FUNCTION_WITH_READONLY_PROTOTYPE_MAP_INDEX, Map, \ sloppy_function_with_readonly_prototype_map) \ V(STRICT_FUNCTION_MAP_INDEX, Map, strict_function_map) \ + V(STRONG_FUNCTION_MAP_INDEX, Map, strong_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(STRONG_CONSTRUCTOR_MAP_INDEX, Map, strong_constructor_map) \ V(BOUND_FUNCTION_MAP_INDEX, Map, bound_function_map) \ V(REGEXP_RESULT_MAP_INDEX, Map, regexp_result_map) \ V(SLOPPY_ARGUMENTS_MAP_INDEX, Map, sloppy_arguments_map) \ @@ -153,7 +155,7 @@ enum BindingFlags { 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(IS_PROMISE_INDEX, JSFunction, is_promise) \ + V(PROMISE_STATUS_INDEX, Symbol, promise_status) \ V(PROMISE_CREATE_INDEX, JSFunction, promise_create) \ V(PROMISE_RESOLVE_INDEX, JSFunction, promise_resolve) \ V(PROMISE_REJECT_INDEX, JSFunction, promise_reject) \ @@ -176,6 +178,7 @@ enum BindingFlags { native_object_notifier_perform_change) \ V(SLOPPY_GENERATOR_FUNCTION_MAP_INDEX, Map, sloppy_generator_function_map) \ V(STRICT_GENERATOR_FUNCTION_MAP_INDEX, Map, strict_generator_function_map) \ + V(STRONG_GENERATOR_FUNCTION_MAP_INDEX, Map, strong_generator_function_map) \ V(GENERATOR_OBJECT_PROTOTYPE_MAP_INDEX, Map, generator_object_prototype_map) \ V(ITERATOR_RESULT_MAP_INDEX, Map, iterator_result_map) \ V(MAP_ITERATOR_MAP_INDEX, Map, map_iterator_map) \ @@ -319,8 +322,10 @@ class Context: public FixedArray { SLOPPY_FUNCTION_MAP_INDEX, SLOPPY_FUNCTION_WITH_READONLY_PROTOTYPE_MAP_INDEX, STRICT_FUNCTION_MAP_INDEX, + STRONG_FUNCTION_MAP_INDEX, SLOPPY_FUNCTION_WITHOUT_PROTOTYPE_MAP_INDEX, STRICT_FUNCTION_WITHOUT_PROTOTYPE_MAP_INDEX, + STRONG_CONSTRUCTOR_MAP_INDEX, BOUND_FUNCTION_MAP_INDEX, INITIAL_OBJECT_PROTOTYPE_INDEX, INITIAL_ARRAY_PROTOTYPE_INDEX, @@ -385,7 +390,7 @@ class Context: public FixedArray { ERROR_MESSAGE_FOR_CODE_GEN_FROM_STRINGS_INDEX, RUN_MICROTASKS_INDEX, ENQUEUE_MICROTASK_INDEX, - IS_PROMISE_INDEX, + PROMISE_STATUS_INDEX, PROMISE_CREATE_INDEX, PROMISE_RESOLVE_INDEX, PROMISE_REJECT_INDEX, @@ -406,6 +411,7 @@ class Context: public FixedArray { NATIVE_OBJECT_NOTIFIER_PERFORM_CHANGE, SLOPPY_GENERATOR_FUNCTION_MAP_INDEX, STRICT_GENERATOR_FUNCTION_MAP_INDEX, + STRONG_GENERATOR_FUNCTION_MAP_INDEX, GENERATOR_OBJECT_PROTOTYPE_MAP_INDEX, ITERATOR_RESULT_MAP_INDEX, MAP_ITERATOR_MAP_INDEX, @@ -570,18 +576,27 @@ class Context: public FixedArray { static int FunctionMapIndex(LanguageMode language_mode, FunctionKind kind) { if (IsGeneratorFunction(kind)) { - return is_strict(language_mode) ? STRICT_GENERATOR_FUNCTION_MAP_INDEX + return is_strong(language_mode) ? STRONG_GENERATOR_FUNCTION_MAP_INDEX : + is_strict(language_mode) ? STRICT_GENERATOR_FUNCTION_MAP_INDEX : SLOPPY_GENERATOR_FUNCTION_MAP_INDEX; } + if (IsConstructor(kind)) { + return is_strong(language_mode) ? STRONG_CONSTRUCTOR_MAP_INDEX : + is_strict(language_mode) ? STRICT_FUNCTION_MAP_INDEX + : SLOPPY_FUNCTION_MAP_INDEX; + } + if (IsArrowFunction(kind) || IsConciseMethod(kind) || IsAccessorFunction(kind)) { - return is_strict(language_mode) - ? STRICT_FUNCTION_WITHOUT_PROTOTYPE_MAP_INDEX - : SLOPPY_FUNCTION_WITHOUT_PROTOTYPE_MAP_INDEX; + return is_strong(language_mode) ? STRONG_FUNCTION_MAP_INDEX : + is_strict(language_mode) ? + STRICT_FUNCTION_WITHOUT_PROTOTYPE_MAP_INDEX : + SLOPPY_FUNCTION_WITHOUT_PROTOTYPE_MAP_INDEX; } - return is_strict(language_mode) ? STRICT_FUNCTION_MAP_INDEX + return is_strong(language_mode) ? STRONG_FUNCTION_MAP_INDEX : + is_strict(language_mode) ? STRICT_FUNCTION_MAP_INDEX : SLOPPY_FUNCTION_MAP_INDEX; } |