aboutsummaryrefslogtreecommitdiff
path: root/deps/v8/src/builtins
diff options
context:
space:
mode:
authorMichaël Zasso <targos@protonmail.com>2016-09-29 21:19:54 +0200
committerMichaël Zasso <targos@protonmail.com>2016-10-03 13:12:08 +0200
commit039f0c3fc568bebd47b2e3a2f08c7e1d51d0689d (patch)
treeca1bfbcf6e07c86e2fd1763ea0d4cc1e64107d85 /deps/v8/src/builtins
parent2893bd2fdf242d562053bd128af41172b566ea24 (diff)
downloadandroid-node-v8-039f0c3fc568bebd47b2e3a2f08c7e1d51d0689d.tar.gz
android-node-v8-039f0c3fc568bebd47b2e3a2f08c7e1d51d0689d.tar.bz2
android-node-v8-039f0c3fc568bebd47b2e3a2f08c7e1d51d0689d.zip
deps: update V8 to 5.4.500.31
PR-URL: https://github.com/nodejs/node/pull/8852 Reviewed-By: Franziska Hinkelmann <franzih@chromium.org> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'deps/v8/src/builtins')
-rw-r--r--deps/v8/src/builtins/builtins.cc11
1 files changed, 5 insertions, 6 deletions
diff --git a/deps/v8/src/builtins/builtins.cc b/deps/v8/src/builtins/builtins.cc
index dd5b4333ce..d5a0e17d17 100644
--- a/deps/v8/src/builtins/builtins.cc
+++ b/deps/v8/src/builtins/builtins.cc
@@ -280,13 +280,12 @@ bool Builtins::AllowDynamicFunction(Isolate* isolate, Handle<JSFunction> target,
Handle<JSObject> target_global_proxy) {
if (FLAG_allow_unsafe_function_constructor) return true;
HandleScopeImplementer* impl = isolate->handle_scope_implementer();
- Handle<Context> responsible_context = impl->LastEnteredContext();
+ Handle<Context> responsible_context =
+ impl->MicrotaskContextIsLastEnteredContext() ? impl->MicrotaskContext()
+ : impl->LastEnteredContext();
+ // TODO(jochen): Remove this.
if (responsible_context.is_null()) {
- responsible_context = impl->MicrotaskContext();
- // TODO(jochen): Remove this.
- if (responsible_context.is_null()) {
- return true;
- }
+ return true;
}
if (*responsible_context == target->context()) return true;
return isolate->MayAccess(responsible_context, target_global_proxy);