From 4f3c9e6aab54ace23bda9266ffb6999f05ae2009 Mon Sep 17 00:00:00 2001
From: Vasili Skurydzin <vasili.skurydzin@ibm.com>
Date: Mon, 29 Oct 2018 10:26:55 -0400
Subject: [PATCH] deps,v8: fix gyp build on Aix platform

Floating this patch since the code does not exist upstream anymore.

deps/v8/testing/gtest.gyp:
Supperss -Wnonnull-compare, -Waddress warnings for deps/v8/testing/gtest
project;

deps/v8/src/compiler/store-store-elimination.cc, deps/v8/src/conversions.cc:
Suppress unused function warnings in order to compile with newer (>4.8.5)
gcc on Aix.

PR-URL: https://github.com/nodejs/node/pull/23958
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Beth Griggs <Bethany.Griggs@uk.ibm.com>
Reviewed-By: George Adams <george.adams@uk.ibm.com>
---
 deps/v8/include/v8-version.h                    | 2 +-
 deps/v8/src/compiler/store-store-elimination.cc | 6 ++++++
 deps/v8/src/conversions.cc                      | 6 ++++++
 deps/v8/testing/gtest.gyp                       | 4 ++++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/deps/v8/include/v8-version.h b/deps/v8/include/v8-version.h
index 40ea0af674bd0c..62c81f2ca057ad 100644
--- a/deps/v8/include/v8-version.h
+++ b/deps/v8/include/v8-version.h
@@ -11,7 +11,7 @@
 #define V8_MAJOR_VERSION 6
 #define V8_MINOR_VERSION 2
 #define V8_BUILD_NUMBER 414
-#define V8_PATCH_LEVEL 74
+#define V8_PATCH_LEVEL 75
 
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)
diff --git a/deps/v8/src/compiler/store-store-elimination.cc b/deps/v8/src/compiler/store-store-elimination.cc
index 71aa2110bb7808..eaa74328f09c71 100644
--- a/deps/v8/src/compiler/store-store-elimination.cc
+++ b/deps/v8/src/compiler/store-store-elimination.cc
@@ -251,6 +251,9 @@ void StoreStoreElimination::Run(JSGraph* js_graph, Zone* temp_zone) {
   }
 }
 
+#if V8_OS_AIX
+ALLOW_UNUSED_TYPE
+#endif
 bool RedundantStoreFinder::IsEffectful(Node* node) {
   return (node->op()->EffectInputCount() >= 1);
 }
@@ -552,6 +555,9 @@ bool UnobservableStore::operator==(const UnobservableStore other) const {
   return (id_ == other.id_) && (offset_ == other.offset_);
 }
 
+#if V8_OS_AIX
+ALLOW_UNUSED_TYPE
+#endif
 bool UnobservableStore::operator!=(const UnobservableStore other) const {
   return !(*this == other);
 }
diff --git a/deps/v8/src/conversions.cc b/deps/v8/src/conversions.cc
index 8956a261688b1b..1071c1f2a1b312 100644
--- a/deps/v8/src/conversions.cc
+++ b/deps/v8/src/conversions.cc
@@ -53,11 +53,17 @@ class StringCharacterStreamIterator {
 };
 
 
+#if V8_OS_AIX
+ALLOW_UNUSED_TYPE
+#endif
 StringCharacterStreamIterator::StringCharacterStreamIterator(
     StringCharacterStream* stream) : stream_(stream) {
   ++(*this);
 }
 
+#if V8_OS_AIX
+ALLOW_UNUSED_TYPE
+#endif
 uint16_t StringCharacterStreamIterator::operator*() const {
   return current_;
 }
diff --git a/deps/v8/testing/gtest.gyp b/deps/v8/testing/gtest.gyp
index a94ee884fe9f51..0eb93a05b591fd 100644
--- a/deps/v8/testing/gtest.gyp
+++ b/deps/v8/testing/gtest.gyp
@@ -96,6 +96,10 @@
               }],
             ],
           }],
+          ['OS=="aix"', {
+            'cflags': [ '-Wno-nonnull-compare',
+                        '-Wno-address' ],
+          }],
         ],
         'msvs_disabled_warnings': [4800],
       },