summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common.gypi2
-rw-r--r--deps/v8/src/builtins/setup-builtins-internal.cc9
2 files changed, 10 insertions, 1 deletions
diff --git a/common.gypi b/common.gypi
index 9a8849fb7c..03095e187d 100644
--- a/common.gypi
+++ b/common.gypi
@@ -39,7 +39,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.6',
+ 'v8_embedder_string': '-node.7',
##### V8 defaults for Node.js #####
diff --git a/deps/v8/src/builtins/setup-builtins-internal.cc b/deps/v8/src/builtins/setup-builtins-internal.cc
index 99ac0d6b1f..e93d7008e4 100644
--- a/deps/v8/src/builtins/setup-builtins-internal.cc
+++ b/deps/v8/src/builtins/setup-builtins-internal.cc
@@ -276,6 +276,10 @@ Code GenerateBytecodeHandler(Isolate* isolate, int builtin_index,
} // namespace
+#ifdef _MSC_VER
+#pragma optimize( "", off )
+#endif
+
// static
void SetupIsolateDelegate::SetupBuiltinsInternal(Isolate* isolate) {
Builtins* builtins = isolate->builtins();
@@ -353,5 +357,10 @@ void SetupIsolateDelegate::SetupBuiltinsInternal(Isolate* isolate) {
builtins->MarkInitialized();
}
+#ifdef _MSC_VER
+#pragma optimize( "", on )
+#endif
+
+
} // namespace internal
} // namespace v8