Selectively enable the 64-to-32 bit truncation diagnostic (facebook#802)

Summary: Pull Request resolved: facebook#802 Ensures the GCC diagnostic ignored "-Wshorten-64-to-32" is only enabled if the C++ compiler supports it. Reviewed By: fbmal7 Differential Revision: D39100412 fbshipit-source-id: a61b056326633e8ea067bf5b5e547ff89a31fec8
gmh5225 · Aug 30, 2022 · 8a6a977 · 8a6a977
1 parent 1814759
commit 8a6a977
Show file tree

Hide file tree

Showing 85 changed files with 382 additions and 0 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -576,6 +576,13 @@ if (HERMES_MEMORY_INSTRUMENTATION)
   add_definitions(-DHERMES_MEMORY_INSTRUMENTATION)
 endif()
 
+# Disables the GCC 64-to-32 bit truncation diagnostic if the compiler supports
+# -Wshorten-64-to-32.
+check_cxx_compiler_flag("-Wshorten-64-to-32" CXX_SUPPORTS_SHORTEN_64_TO_32)
+if (${CXX_SUPPORTS_SHORTEN_64_TO_32})
+  add_definitions(-DHERMES_COMPILER_SUPPORTS_WSHORTEN_64_TO_32)
+endif()
+
 set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++17")
 
 # JSI_DIR has always priority over other folders.

diff --git a/external/llvh/include/llvh/ADT/APInt.h b/external/llvh/include/llvh/ADT/APInt.h
@@ -23,7 +23,10 @@
 #include <string>
 
 #pragma GCC diagnostic push
+
+#ifdef HERMES_COMPILER_SUPPORTS_WSHORTEN_64_TO_32
 #pragma GCC diagnostic ignored "-Wshorten-64-to-32"
+#endif
 
 namespace llvh {
 class FoldingSetNodeID;

diff --git a/external/llvh/include/llvh/ADT/DenseMap.h b/external/llvh/include/llvh/ADT/DenseMap.h
@@ -31,7 +31,10 @@
 #include <utility>
 
 #pragma GCC diagnostic push
+
+#ifdef HERMES_COMPILER_SUPPORTS_WSHORTEN_64_TO_32
 #pragma GCC diagnostic ignored "-Wshorten-64-to-32"
+#endif
 
 namespace llvh {
 

diff --git a/external/llvh/include/llvh/ADT/DenseMapInfo.h b/external/llvh/include/llvh/ADT/DenseMapInfo.h
@@ -24,7 +24,10 @@
 #include <utility>
 
 #pragma GCC diagnostic push
+
+#ifdef HERMES_COMPILER_SUPPORTS_WSHORTEN_64_TO_32
 #pragma GCC diagnostic ignored "-Wshorten-64-to-32"
+#endif
 
 namespace llvh {
 

diff --git a/external/llvh/include/llvh/ADT/Hashing.h b/external/llvh/include/llvh/ADT/Hashing.h
@@ -55,7 +55,10 @@
 #include <utility>
 
 #pragma GCC diagnostic push
+
+#ifdef HERMES_COMPILER_SUPPORTS_WSHORTEN_64_TO_32
 #pragma GCC diagnostic ignored "-Wshorten-64-to-32"
+#endif
 
 namespace llvh {
 

diff --git a/external/llvh/include/llvh/ADT/MapVector.h b/external/llvh/include/llvh/ADT/MapVector.h
@@ -27,7 +27,10 @@
 #include <vector>
 
 #pragma GCC diagnostic push
+
+#ifdef HERMES_COMPILER_SUPPORTS_WSHORTEN_64_TO_32
 #pragma GCC diagnostic ignored "-Wshorten-64-to-32"
+#endif
 
 namespace llvh {
 

diff --git a/external/llvh/include/llvh/ADT/SmallVector.h b/external/llvh/include/llvh/ADT/SmallVector.h
@@ -34,7 +34,10 @@
 #include <utility>
 
 #pragma GCC diagnostic push
+
+#ifdef HERMES_COMPILER_SUPPORTS_WSHORTEN_64_TO_32
 #pragma GCC diagnostic ignored "-Wshorten-64-to-32"
+#endif
 
 namespace llvh {
 

diff --git a/external/llvh/include/llvh/ADT/StringRef.h b/external/llvh/include/llvh/ADT/StringRef.h
@@ -22,7 +22,10 @@
 #include <utility>
 
 #pragma GCC diagnostic push
+
+#ifdef HERMES_COMPILER_SUPPORTS_WSHORTEN_64_TO_32
 #pragma GCC diagnostic ignored "-Wshorten-64-to-32"
+#endif
 
 namespace llvh {
 

diff --git a/external/llvh/include/llvh/IR/InstrTypes.h b/external/llvh/include/llvh/IR/InstrTypes.h
@@ -43,7 +43,10 @@
 #include <vector>
 
 #pragma GCC diagnostic push
+
+#ifdef HERMES_COMPILER_SUPPORTS_WSHORTEN_64_TO_32
 #pragma GCC diagnostic ignored "-Wshorten-64-to-32"
+#endif
 
 namespace llvh {
 

diff --git a/external/llvh/include/llvh/Support/MathExtras.h b/external/llvh/include/llvh/Support/MathExtras.h
@@ -24,7 +24,10 @@
 #include <type_traits>
 
 #pragma GCC diagnostic push
+
+#ifdef HERMES_COMPILER_SUPPORTS_WSHORTEN_64_TO_32
 #pragma GCC diagnostic ignored "-Wshorten-64-to-32"
+#endif
 
 #ifdef __ANDROID_NDK__
 #include <android/api-level.h>

diff --git a/external/llvh/patches/ifdef_around_ignore_Wshorten-64-to-32_warning.patch b/external/llvh/patches/ifdef_around_ignore_Wshorten-64-to-32_warning.patch
@@ -0,0 +1,126 @@
+diff --git a/xplat/hermes/external/llvh/include/llvh/ADT/APInt.h b/xplat/hermes/external/llvh/include/llvh/ADT/APInt.h
+--- a/xplat/hermes/external/llvh/include/llvh/ADT/APInt.h
++++ b/xplat/hermes/external/llvh/include/llvh/ADT/APInt.h
+@@ -23,7 +23,10 @@
+ #include <string>
+
+ #pragma GCC diagnostic push
++
++#ifdef HERMES_COMPILER_SUPPORTS_WSHORTEN_64_TO_32
+ #pragma GCC diagnostic ignored "-Wshorten-64-to-32"
++#endif
+
+ namespace llvh {
+ class FoldingSetNodeID;
+diff --git a/xplat/hermes/external/llvh/include/llvh/ADT/DenseMap.h b/xplat/hermes/external/llvh/include/llvh/ADT/DenseMap.h
+--- a/xplat/hermes/external/llvh/include/llvh/ADT/DenseMap.h
++++ b/xplat/hermes/external/llvh/include/llvh/ADT/DenseMap.h
+@@ -31,7 +31,10 @@
+ #include <utility>
+
+ #pragma GCC diagnostic push
++
++#ifdef HERMES_COMPILER_SUPPORTS_WSHORTEN_64_TO_32
+ #pragma GCC diagnostic ignored "-Wshorten-64-to-32"
++#endif
+
+ namespace llvh {
+
+diff --git a/xplat/hermes/external/llvh/include/llvh/ADT/DenseMapInfo.h b/xplat/hermes/external/llvh/include/llvh/ADT/DenseMapInfo.h
+--- a/xplat/hermes/external/llvh/include/llvh/ADT/DenseMapInfo.h
++++ b/xplat/hermes/external/llvh/include/llvh/ADT/DenseMapInfo.h
+@@ -24,7 +24,10 @@
+ #include <utility>
+
+ #pragma GCC diagnostic push
++
++#ifdef HERMES_COMPILER_SUPPORTS_WSHORTEN_64_TO_32
+ #pragma GCC diagnostic ignored "-Wshorten-64-to-32"
++#endif
+
+ namespace llvh {
+
+diff --git a/xplat/hermes/external/llvh/include/llvh/ADT/Hashing.h b/xplat/hermes/external/llvh/include/llvh/ADT/Hashing.h
+--- a/xplat/hermes/external/llvh/include/llvh/ADT/Hashing.h
++++ b/xplat/hermes/external/llvh/include/llvh/ADT/Hashing.h
+@@ -55,7 +55,10 @@
+ #include <utility>
+
+ #pragma GCC diagnostic push
++
++#ifdef HERMES_COMPILER_SUPPORTS_WSHORTEN_64_TO_32
+ #pragma GCC diagnostic ignored "-Wshorten-64-to-32"
++#endif
+
+ namespace llvh {
+
+diff --git a/xplat/hermes/external/llvh/include/llvh/ADT/MapVector.h b/xplat/hermes/external/llvh/include/llvh/ADT/MapVector.h
+--- a/xplat/hermes/external/llvh/include/llvh/ADT/MapVector.h
++++ b/xplat/hermes/external/llvh/include/llvh/ADT/MapVector.h
+@@ -27,7 +27,10 @@
+ #include <vector>
+
+ #pragma GCC diagnostic push
++
++#ifdef HERMES_COMPILER_SUPPORTS_WSHORTEN_64_TO_32
+ #pragma GCC diagnostic ignored "-Wshorten-64-to-32"
++#endif
+
+ namespace llvh {
+
+diff --git a/xplat/hermes/external/llvh/include/llvh/ADT/SmallVector.h b/xplat/hermes/external/llvh/include/llvh/ADT/SmallVector.h
+--- a/xplat/hermes/external/llvh/include/llvh/ADT/SmallVector.h
++++ b/xplat/hermes/external/llvh/include/llvh/ADT/SmallVector.h
+@@ -34,7 +34,10 @@
+ #include <utility>
+
+ #pragma GCC diagnostic push
++
++#ifdef HERMES_COMPILER_SUPPORTS_WSHORTEN_64_TO_32
+ #pragma GCC diagnostic ignored "-Wshorten-64-to-32"
++#endif
+
+ namespace llvh {
+
+diff --git a/xplat/hermes/external/llvh/include/llvh/ADT/StringRef.h b/xplat/hermes/external/llvh/include/llvh/ADT/StringRef.h
+--- a/xplat/hermes/external/llvh/include/llvh/ADT/StringRef.h
++++ b/xplat/hermes/external/llvh/include/llvh/ADT/StringRef.h
+@@ -22,7 +22,10 @@
+ #include <utility>
+
+ #pragma GCC diagnostic push
++
++#ifdef HERMES_COMPILER_SUPPORTS_WSHORTEN_64_TO_32
+ #pragma GCC diagnostic ignored "-Wshorten-64-to-32"
++#endif
+
+ namespace llvh {
+
+diff --git a/xplat/hermes/external/llvh/include/llvh/IR/InstrTypes.h b/xplat/hermes/external/llvh/include/llvh/IR/InstrTypes.h
+--- a/xplat/hermes/external/llvh/include/llvh/IR/InstrTypes.h
++++ b/xplat/hermes/external/llvh/include/llvh/IR/InstrTypes.h
+@@ -43,7 +43,10 @@
+ #include <vector>
+
+ #pragma GCC diagnostic push
++
++#ifdef HERMES_COMPILER_SUPPORTS_WSHORTEN_64_TO_32
+ #pragma GCC diagnostic ignored "-Wshorten-64-to-32"
++#endif
+
+ namespace llvh {
+
+diff --git a/xplat/hermes/external/llvh/include/llvh/Support/MathExtras.h b/xplat/hermes/external/llvh/include/llvh/Support/MathExtras.h
+--- a/xplat/hermes/external/llvh/include/llvh/Support/MathExtras.h
++++ b/xplat/hermes/external/llvh/include/llvh/Support/MathExtras.h
+@@ -24,7 +24,10 @@
+ #include <type_traits>
+
+ #pragma GCC diagnostic push
++
++#ifdef HERMES_COMPILER_SUPPORTS_WSHORTEN_64_TO_32
+ #pragma GCC diagnostic ignored "-Wshorten-64-to-32"
++#endif
+
+ #ifdef __ANDROID_NDK__
+ #include <android/api-level.h>
diff --git a/include/hermes/ADT/BitArray.h b/include/hermes/ADT/BitArray.h
@@ -14,7 +14,10 @@
 #include <bitset>
 
 #pragma GCC diagnostic push
+
+#ifdef HERMES_COMPILER_SUPPORTS_WSHORTEN_64_TO_32
 #pragma GCC diagnostic ignored "-Wshorten-64-to-32"
+#endif
 
 namespace hermes {
 

diff --git a/include/hermes/ADT/CompactArray.h b/include/hermes/ADT/CompactArray.h
@@ -14,7 +14,10 @@
 #include <cassert>
 #include <limits>
 #pragma GCC diagnostic push
+
+#ifdef HERMES_COMPILER_SUPPORTS_WSHORTEN_64_TO_32
 #pragma GCC diagnostic ignored "-Wshorten-64-to-32"
+#endif
 namespace hermes {
 
 namespace vm {

diff --git a/include/hermes/ADT/SafeInt.h b/include/hermes/ADT/SafeInt.h
@@ -12,7 +12,10 @@
 #include <cstdint>
 #include <limits>
 #pragma GCC diagnostic push
+
+#ifdef HERMES_COMPILER_SUPPORTS_WSHORTEN_64_TO_32
 #pragma GCC diagnostic ignored "-Wshorten-64-to-32"
+#endif
 namespace hermes {
 
 /// To avoid overflow, we introduce the SafeUInt32 which can be used

diff --git a/include/hermes/BCGen/HBC/Bytecode.h b/include/hermes/BCGen/HBC/Bytecode.h
@@ -23,7 +23,10 @@
 
 #include <memory>
 #pragma GCC diagnostic push
+
+#ifdef HERMES_COMPILER_SUPPORTS_WSHORTEN_64_TO_32
 #pragma GCC diagnostic ignored "-Wshorten-64-to-32"
+#endif
 namespace hermes {
 class SourceMapGenerator;
 

diff --git a/include/hermes/BCGen/HBC/BytecodeDataProvider.h b/include/hermes/BCGen/HBC/BytecodeDataProvider.h
@@ -24,7 +24,10 @@
 #include <thread>
 
 #pragma GCC diagnostic push
+
+#ifdef HERMES_COMPILER_SUPPORTS_WSHORTEN_64_TO_32
 #pragma GCC diagnostic ignored "-Wshorten-64-to-32"
+#endif
 
 namespace hermes {
 namespace hbc {

diff --git a/include/hermes/BCGen/HBC/BytecodeInstructionGenerator.h b/include/hermes/BCGen/HBC/BytecodeInstructionGenerator.h
@@ -12,7 +12,10 @@
 
 #include <vector>
 #pragma GCC diagnostic push
+
+#ifdef HERMES_COMPILER_SUPPORTS_WSHORTEN_64_TO_32
 #pragma GCC diagnostic ignored "-Wshorten-64-to-32"
+#endif
 namespace hermes {
 namespace hbc {
 

diff --git a/include/hermes/Regex/RegexBytecode.h b/include/hermes/Regex/RegexBytecode.h
@@ -14,7 +14,10 @@
 #include <cstdint>
 #include <vector>
 #pragma GCC diagnostic push
+
+#ifdef HERMES_COMPILER_SUPPORTS_WSHORTEN_64_TO_32
 #pragma GCC diagnostic ignored "-Wshorten-64-to-32"
+#endif
 namespace hermes {
 namespace regex {
 

diff --git a/include/hermes/SourceMap/SourceMap.h b/include/hermes/SourceMap/SourceMap.h
@@ -16,7 +16,10 @@
 
 #include <vector>
 #pragma GCC diagnostic push
+
+#ifdef HERMES_COMPILER_SUPPORTS_WSHORTEN_64_TO_32
 #pragma GCC diagnostic ignored "-Wshorten-64-to-32"
+#endif
 namespace hermes {
 
 /// Represent a source location in original JS source file.

diff --git a/include/hermes/SourceMap/SourceMapGenerator.h b/include/hermes/SourceMap/SourceMapGenerator.h
@@ -16,7 +16,10 @@
 #include <llvh/ADT/DenseMap.h>
 #include <vector>
 #pragma GCC diagnostic push
+
+#ifdef HERMES_COMPILER_SUPPORTS_WSHORTEN_64_TO_32
 #pragma GCC diagnostic ignored "-Wshorten-64-to-32"
+#endif
 namespace hermes {
 
 /// A class representing a JavaScript source map, version 3 only. It borrows

diff --git a/include/hermes/Support/Allocator.h b/include/hermes/Support/Allocator.h
@@ -18,7 +18,10 @@
 #include <memory>
 #include <vector>
 #pragma GCC diagnostic push
+
+#ifdef HERMES_COMPILER_SUPPORTS_WSHORTEN_64_TO_32
 #pragma GCC diagnostic ignored "-Wshorten-64-to-32"
+#endif
 namespace hermes {
 
 /// A slab based BumpPtrAllocator where the pointer can be saved and restored.

diff --git a/include/hermes/Support/BigIntSupport.h b/include/hermes/Support/BigIntSupport.h
@@ -21,7 +21,10 @@
 #include <string>
 #include <vector>
 #pragma GCC diagnostic push
+
+#ifdef HERMES_COMPILER_SUPPORTS_WSHORTEN_64_TO_32
 #pragma GCC diagnostic ignored "-Wshorten-64-to-32"
+#endif
 namespace hermes {
 namespace bigint {
 

diff --git a/include/hermes/Support/RegExpSerialization.h b/include/hermes/Support/RegExpSerialization.h
@@ -16,7 +16,10 @@
 #include <memory>
 #include <string>
 #pragma GCC diagnostic push
+
+#ifdef HERMES_COMPILER_SUPPORTS_WSHORTEN_64_TO_32
 #pragma GCC diagnostic ignored "-Wshorten-64-to-32"
+#endif
 namespace llvh {
 class raw_ostream;
 }

diff --git a/include/hermes/VM/ArrayLike.h b/include/hermes/VM/ArrayLike.h
@@ -13,7 +13,10 @@
 #include "hermes/VM/JSArray.h"
 #include "hermes/VM/JSObject.h"
 #pragma GCC diagnostic push
+
+#ifdef HERMES_COMPILER_SUPPORTS_WSHORTEN_64_TO_32
 #pragma GCC diagnostic ignored "-Wshorten-64-to-32"
+#endif
 namespace hermes {
 namespace vm {
 

diff --git a/include/hermes/VM/ArrayStorage.h b/include/hermes/VM/ArrayStorage.h
@@ -15,7 +15,10 @@
 
 #include "llvh/Support/TrailingObjects.h"
 #pragma GCC diagnostic push
+
+#ifdef HERMES_COMPILER_SUPPORTS_WSHORTEN_64_TO_32
 #pragma GCC diagnostic ignored "-Wshorten-64-to-32"
+#endif
 namespace hermes {
 namespace vm {