From 36cd5fb9d27b830320e57213f5b8829ffbb93324 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Fri, 27 Mar 2015 12:04:12 +0100 Subject: deps: upgrade v8 to 4.2.77.13 This commit applies some secondary changes in order to make `make test` pass cleanly: * disable broken postmortem debugging in common.gypi * drop obsolete strict mode test in parallel/test-repl * drop obsolete test parallel/test-v8-features PR-URL: https://github.com/iojs/io.js/pull/1232 Reviewed-By: Fedor Indutny --- deps/v8/src/contexts.h | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) (limited to 'deps/v8/src/contexts.h') diff --git a/deps/v8/src/contexts.h b/deps/v8/src/contexts.h index cd3ff14211..f932c60092 100644 --- a/deps/v8/src/contexts.h +++ b/deps/v8/src/contexts.h @@ -100,8 +100,6 @@ enum BindingFlags { V(TO_INT32_FUN_INDEX, JSFunction, to_int32_fun) \ V(TO_LENGTH_FUN_INDEX, JSFunction, to_length_fun) \ V(GLOBAL_EVAL_FUN_INDEX, JSFunction, global_eval_fun) \ - V(INSTANTIATE_FUN_INDEX, JSFunction, instantiate_fun) \ - V(CONFIGURE_INSTANCE_FUN_INDEX, JSFunction, configure_instance_fun) \ V(ARRAY_BUFFER_FUN_INDEX, JSFunction, array_buffer_fun) \ V(UINT8_ARRAY_FUN_INDEX, JSFunction, uint8_array_fun) \ V(INT8_ARRAY_FUN_INDEX, JSFunction, int8_array_fun) \ @@ -140,7 +138,7 @@ enum BindingFlags { V(MAKE_MESSAGE_FUN_INDEX, JSFunction, make_message_fun) \ V(GET_STACK_TRACE_LINE_INDEX, JSFunction, get_stack_trace_line_fun) \ V(CONFIGURE_GLOBAL_INDEX, JSFunction, configure_global_fun) \ - V(FUNCTION_CACHE_INDEX, JSObject, function_cache) \ + V(FUNCTION_CACHE_INDEX, FixedArray, function_cache) \ V(JSFUNCTION_RESULT_CACHES_INDEX, FixedArray, jsfunction_result_caches) \ V(NORMALIZED_MAP_CACHE_INDEX, Object, normalized_map_cache) \ V(RUNTIME_CONTEXT_INDEX, Context, runtime_context) \ @@ -348,8 +346,6 @@ class Context: public FixedArray { TO_INT32_FUN_INDEX, TO_BOOLEAN_FUN_INDEX, GLOBAL_EVAL_FUN_INDEX, - INSTANTIATE_FUN_INDEX, - CONFIGURE_INSTANCE_FUN_INDEX, ARRAY_BUFFER_FUN_INDEX, UINT8_ARRAY_FUN_INDEX, INT8_ARRAY_FUN_INDEX, @@ -572,20 +568,21 @@ class Context: public FixedArray { return kHeaderSize + index * kPointerSize - kHeapObjectTag; } - static int FunctionMapIndex(StrictMode strict_mode, FunctionKind kind) { + static int FunctionMapIndex(LanguageMode language_mode, FunctionKind kind) { if (IsGeneratorFunction(kind)) { - return strict_mode == SLOPPY ? SLOPPY_GENERATOR_FUNCTION_MAP_INDEX - : STRICT_GENERATOR_FUNCTION_MAP_INDEX; + return is_strict(language_mode) ? STRICT_GENERATOR_FUNCTION_MAP_INDEX + : SLOPPY_GENERATOR_FUNCTION_MAP_INDEX; } - if (IsArrowFunction(kind) || IsConciseMethod(kind)) { - return strict_mode == SLOPPY - ? SLOPPY_FUNCTION_WITHOUT_PROTOTYPE_MAP_INDEX - : STRICT_FUNCTION_WITHOUT_PROTOTYPE_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 strict_mode == SLOPPY ? SLOPPY_FUNCTION_MAP_INDEX - : STRICT_FUNCTION_MAP_INDEX; + return is_strict(language_mode) ? STRICT_FUNCTION_MAP_INDEX + : SLOPPY_FUNCTION_MAP_INDEX; } static const int kSize = kHeaderSize + NATIVE_CONTEXT_SLOTS * kPointerSize; -- cgit v1.2.1