commit 7aecf1f4e2dfe0e96d35cdfa5363cd27eef15dfa
author Michael Hablich <hablich@chromium.org> Tue Mar 21 11:55:36 2017
committer Michael Hablich <hablich@chromium.org> Tue Mar 21 11:58:53 2017
tree 5d2f19daea2cee77cdd8a72681270c321b9c5c54
parent f80439646ae20f2328d82659dcc38fd154441eec

Version 5.9.61.1 (cherry-pick)

Merged 3100f9b2553b079a796a42213d2cfa3af932ca08
Merged 2470f2ac7193be5ec54b9c90a9df362543657c88

Fix unused variable on win32 build

Disable the 'Function marked forceinline not inlined.' warning on Win.

BUG=chromium:703027,chromium:703028
LOG=N

Change-Id: I8d334f230cd8417aca5a573a35b36f512e307526
Reviewed-on: https://chromium-review.googlesource.com/456708
Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/5.9.61@{#2}
Cr-Branched-From: 198bab4ec075f3996d6129dbe2a96df789fed09f-refs/heads/master@{#43942}

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 048a8f4..38fbee23 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -473,6 +473,7 @@
       "/wd4702",  # Unreachable code.
       "/wd4703",  # Potentially uninitialized local pointer variable.
       "/wd4709",  # Comma operator within array index expr (bugged).
+      "/wd4714",  # Function marked forceinline not inlined.
       "/wd4718",  # Recursive call has no side-effect.
       "/wd4800",  # Forcing value to bool.
     ]

include/v8-version.h

diff --git a/include/v8-version.h b/include/v8-version.h
index 421821e..2887378 100644
--- a/include/v8-version.h
+++ b/include/v8-version.h
@@ -11,7 +11,7 @@
 #define V8_MAJOR_VERSION 5
 #define V8_MINOR_VERSION 9
 #define V8_BUILD_NUMBER 61
-#define V8_PATCH_LEVEL 0
+#define V8_PATCH_LEVEL 1
 
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)

src/base/platform/platform.h

diff --git a/src/base/platform/platform.h b/src/base/platform/platform.h
index 018d9e7..9259ec8 100644
--- a/src/base/platform/platform.h
+++ b/src/base/platform/platform.h
@@ -56,6 +56,7 @@
   const intptr_t kMaxSlots = kMaxInlineSlots + 1024;
   const intptr_t kPointerSize = sizeof(void*);
   DCHECK(0 <= index && index < kMaxSlots);
+  USE(kMaxSlots);
   if (index < kMaxInlineSlots) {
     return static_cast<intptr_t>(__readfsdword(kTibInlineTlsOffset +
                                                kPointerSize * index));