diff options
| author | Fedor Indutny <fedor@indutny.com> | 2014-10-10 14:49:02 +0400 |
|---|---|---|
| committer | Fedor Indutny <fedor@indutny.com> | 2014-10-10 14:49:02 +0400 |
| commit | 6bcea4ff932144a5fd02affefd45164fbf471e67 (patch) | |
| tree | a8e078c679b12f0daebe10ed254239cb0d79e146 /deps/v8/src/contexts.h | |
| parent | 4fae2356d105e394115188a814097c4a95ae0c5d (diff) | |
| download | android-node-v8-6bcea4ff932144a5fd02affefd45164fbf471e67.tar.gz android-node-v8-6bcea4ff932144a5fd02affefd45164fbf471e67.tar.bz2 android-node-v8-6bcea4ff932144a5fd02affefd45164fbf471e67.zip | |
deps: update v8 to 3.29.93.1
Diffstat (limited to 'deps/v8/src/contexts.h')
| -rw-r--r-- | deps/v8/src/contexts.h | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/deps/v8/src/contexts.h b/deps/v8/src/contexts.h index 63c9955b97..ac25e48853 100644 --- a/deps/v8/src/contexts.h +++ b/deps/v8/src/contexts.h @@ -201,7 +201,8 @@ enum BindingFlags { V(MAP_ITERATOR_MAP_INDEX, Map, map_iterator_map) \ V(SET_ITERATOR_MAP_INDEX, Map, set_iterator_map) \ V(ITERATOR_SYMBOL_INDEX, Symbol, iterator_symbol) \ - V(UNSCOPABLES_SYMBOL_INDEX, Symbol, unscopables_symbol) + V(UNSCOPABLES_SYMBOL_INDEX, Symbol, unscopables_symbol) \ + V(ARRAY_VALUES_ITERATOR_INDEX, JSFunction, array_values_iterator) // JSFunctions are pairs (context, function code), sometimes also called // closures. A Context object is used to represent function contexts and @@ -396,6 +397,7 @@ class Context: public FixedArray { SET_ITERATOR_MAP_INDEX, ITERATOR_SYMBOL_INDEX, UNSCOPABLES_SYMBOL_INDEX, + ARRAY_VALUES_ITERATOR_INDEX, // Properties from here are treated as weak references by the full GC. // Scavenge treats them as strong references. @@ -551,14 +553,20 @@ class Context: public FixedArray { return kHeaderSize + index * kPointerSize - kHeapObjectTag; } - static int FunctionMapIndex(StrictMode strict_mode, bool is_generator) { - return is_generator - ? (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 int FunctionMapIndex(StrictMode strict_mode, FunctionKind kind) { + if (IsGeneratorFunction(kind)) { + return strict_mode == SLOPPY ? SLOPPY_GENERATOR_FUNCTION_MAP_INDEX + : STRICT_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; + } + + return strict_mode == SLOPPY ? SLOPPY_FUNCTION_MAP_INDEX + : STRICT_FUNCTION_MAP_INDEX; } static const int kSize = kHeaderSize + NATIVE_CONTEXT_SLOTS * kPointerSize; |