diff --git a/common.gypi b/common.gypi index 9b37dc9ff581a3..f8d98fb492db42 100644 --- a/common.gypi +++ b/common.gypi @@ -36,7 +36,7 @@ # Reset this number to 0 on major V8 upgrades. # Increment by one for each non-official patch applied to deps/v8. - 'v8_embedder_string': '-node.4', + 'v8_embedder_string': '-node.5', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/src/codegen/tnode.h b/deps/v8/src/codegen/tnode.h index cd7bd8db98c241..7629e89ad693fe 100644 --- a/deps/v8/src/codegen/tnode.h +++ b/deps/v8/src/codegen/tnode.h @@ -269,8 +269,9 @@ using BuiltinPtr = Smi; template struct is_subtype { static const bool value = - std::is_base_of::value || (std::is_same::value && - std::is_convertible::value); + std::disjunction, + std::conjunction, + std::is_convertible>>::value; }; template struct is_subtype, U> {