summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--deps/v8/DEPS2
-rw-r--r--deps/v8/include/v8-version.h2
-rw-r--r--deps/v8/src/ia32/macro-assembler-ia32.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/deps/v8/DEPS b/deps/v8/DEPS
index 36d9d0eaeb..42e7a40baa 100644
--- a/deps/v8/DEPS
+++ b/deps/v8/DEPS
@@ -17,7 +17,7 @@ deps = {
'v8/tools/gyp':
Var('chromium_url') + '/external/gyp.git' + '@' + 'd61a9397e668fa9843c4aa7da9e79460fe590bfb',
'v8/third_party/depot_tools':
- Var('chromium_url') + '/chromium/tools/depot_tools.git' + '@' + '1aa405fd859a3bd625b0d61184d6e4a3cf95c0b4',
+ Var('chromium_url') + '/chromium/tools/depot_tools.git' + '@' + 'aaf2cc09c6874e394c6c1e4692360cc400d6b388',
'v8/third_party/icu':
Var('chromium_url') + '/chromium/deps/icu.git' + '@' + 'a191af9d025859e8368b8b469120d78006e9f5f6',
'v8/third_party/instrumented_libraries':
diff --git a/deps/v8/include/v8-version.h b/deps/v8/include/v8-version.h
index b4c837cda4..a93cd9be0c 100644
--- a/deps/v8/include/v8-version.h
+++ b/deps/v8/include/v8-version.h
@@ -11,7 +11,7 @@
#define V8_MAJOR_VERSION 7
#define V8_MINOR_VERSION 0
#define V8_BUILD_NUMBER 276
-#define V8_PATCH_LEVEL 20
+#define V8_PATCH_LEVEL 22
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
diff --git a/deps/v8/src/ia32/macro-assembler-ia32.cc b/deps/v8/src/ia32/macro-assembler-ia32.cc
index 5ff4b66e61..bb806edebd 100644
--- a/deps/v8/src/ia32/macro-assembler-ia32.cc
+++ b/deps/v8/src/ia32/macro-assembler-ia32.cc
@@ -742,7 +742,7 @@ void MacroAssembler::EnterExitFramePrologue(StackFrame::Type frame_type) {
ExternalReference::Create(IsolateAddressId::kCFunctionAddress, isolate());
mov(StaticVariable(c_entry_fp_address), ebp);
mov(StaticVariable(context_address), esi);
- mov(StaticVariable(c_function_address), ebx);
+ mov(StaticVariable(c_function_address), edx);
}