From 0597c110d024201f0e5f15e6d735771ca4f40b86 Mon Sep 17 00:00:00 2001
From: anlowee <anlowee@outlook.com>
Date: Tue, 12 Aug 2025 03:21:18 +0000
Subject: [PATCH 1/6] Bump velox

---
 presto-native-execution/velox | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/presto-native-execution/velox b/presto-native-execution/velox
index 28be93b4d05bf..d78134d58d09d 160000
--- a/presto-native-execution/velox
+++ b/presto-native-execution/velox
@@ -1 +1 @@
-Subproject commit 28be93b4d05bf6d9faa5058227dd4f8d4688b96d
+Subproject commit d78134d58d09d2c138bec52fde924d3b120f7fb6

From 25fab3e674b893932db036a9d43fa4ec8c3d6911 Mon Sep 17 00:00:00 2001
From: anlowee <anlowee@outlook.com>
Date: Tue, 12 Aug 2025 04:17:31 +0000
Subject: [PATCH 2/6] Try fix LTO

---
 presto-native-execution/velox | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/presto-native-execution/velox b/presto-native-execution/velox
index d78134d58d09d..e52e604eabf81 160000
--- a/presto-native-execution/velox
+++ b/presto-native-execution/velox
@@ -1 +1 @@
-Subproject commit d78134d58d09d2c138bec52fde924d3b120f7fb6
+Subproject commit e52e604eabf813420bb72d4435990b2fc1396e68

From 75226522052f26b8fffefe13a3163c3de4f7d092 Mon Sep 17 00:00:00 2001
From: Kirk Rodrigues <2454684+kirkrodrigues@users.noreply.github.com>
Date: Tue, 12 Aug 2025 06:12:17 -0400
Subject: [PATCH 3/6] Revert "Try fix LTO"

This reverts commit 25fab3e674b893932db036a9d43fa4ec8c3d6911.
---
 presto-native-execution/velox | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/presto-native-execution/velox b/presto-native-execution/velox
index e52e604eabf81..d78134d58d09d 160000
--- a/presto-native-execution/velox
+++ b/presto-native-execution/velox
@@ -1 +1 @@
-Subproject commit e52e604eabf813420bb72d4435990b2fc1396e68
+Subproject commit d78134d58d09d2c138bec52fde924d3b120f7fb6

From 0ce1c9239549b8a3f853fc9a509619dfd7af0947 Mon Sep 17 00:00:00 2001
From: Kirk Rodrigues <2454684+kirkrodrigues@users.noreply.github.com>
Date: Tue, 12 Aug 2025 06:12:30 -0400
Subject: [PATCH 4/6] Try disabling stringop-overflow which is buggy in GCC
 12.2.

---
 presto-native-execution/CMakeLists.txt | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/presto-native-execution/CMakeLists.txt b/presto-native-execution/CMakeLists.txt
index ca4ffcf03df7a..61578c8702c56 100644
--- a/presto-native-execution/CMakeLists.txt
+++ b/presto-native-execution/CMakeLists.txt
@@ -29,6 +29,21 @@ set(CMAKE_CXX_STANDARD_REQUIRED True)
 message("Appending CMAKE_CXX_FLAGS with ${SCRIPT_CXX_FLAGS}")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SCRIPT_CXX_FLAGS}")
 
+# Disable -Wstringop-overflow to avoid a false positive in the following compiler versions. See
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=117983
+#
+# NOTE: Typically, this is disabled using a VELOX_SUPPRESS_STRINGOP guard within the code; but that
+# doesn't apply to 3rd-party libraries, so we need to disable it globally for now.
+if("GNU" STREQUAL "${CMAKE_CXX_COMPILER_ID}"
+    AND ((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 12
+         AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.5)
+         OR (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 13
+             AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13.4)
+         OR (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 14
+             AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 14.3)))
+    target_compile_options(log_surgeon PRIVATE "-Wno-stringop-overflow")
+endif()
+
 # Known warnings that are benign can be disabled:
 #
 # * `restrict` since it triggers a bug in gcc 12. See

From b8470f59aff75c7eb33f8b58df8442a7b6c98fe5 Mon Sep 17 00:00:00 2001
From: Kirk Rodrigues <2454684+kirkrodrigues@users.noreply.github.com>
Date: Tue, 12 Aug 2025 06:17:21 -0400
Subject: [PATCH 5/6] Fix previous commit.

---
 presto-native-execution/CMakeLists.txt | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/presto-native-execution/CMakeLists.txt b/presto-native-execution/CMakeLists.txt
index 61578c8702c56..6f32f5003c880 100644
--- a/presto-native-execution/CMakeLists.txt
+++ b/presto-native-execution/CMakeLists.txt
@@ -29,6 +29,15 @@ set(CMAKE_CXX_STANDARD_REQUIRED True)
 message("Appending CMAKE_CXX_FLAGS with ${SCRIPT_CXX_FLAGS}")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SCRIPT_CXX_FLAGS}")
 
+# Known warnings that are benign can be disabled:
+#
+# * `restrict` since it triggers a bug in gcc 12. See
+#   https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105651
+set(DISABLED_WARNINGS
+    "-Wno-nullability-completeness \
+     -Wno-deprecated-declarations \
+     -Wno-restrict")
+
 # Disable -Wstringop-overflow to avoid a false positive in the following compiler versions. See
 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=117983
 #
@@ -41,18 +50,9 @@ if("GNU" STREQUAL "${CMAKE_CXX_COMPILER_ID}"
              AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13.4)
          OR (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 14
              AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 14.3)))
-    target_compile_options(log_surgeon PRIVATE "-Wno-stringop-overflow")
+    set(DISABLED_WARNINGS "${DISABLED_WARNINGS} -Wno-stringop-overflow")
 endif()
 
-# Known warnings that are benign can be disabled:
-#
-# * `restrict` since it triggers a bug in gcc 12. See
-#   https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105651
-set(DISABLED_WARNINGS
-    "-Wno-nullability-completeness \
-     -Wno-deprecated-declarations \
-     -Wno-restrict")
-
 # Important warnings that must be explicitly enabled.
 set(ENABLE_WARNINGS "-Wreorder")
 

From be052cbaa2dd1a045743ba1d1fff39f91e1f733d Mon Sep 17 00:00:00 2001
From: anlowee <anlowee@outlook.com>
Date: Tue, 12 Aug 2025 17:12:54 +0000
Subject: [PATCH 6/6] Format

---
 presto-native-execution/CMakeLists.txt | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/presto-native-execution/CMakeLists.txt b/presto-native-execution/CMakeLists.txt
index 6f32f5003c880..5474fe970e6d8 100644
--- a/presto-native-execution/CMakeLists.txt
+++ b/presto-native-execution/CMakeLists.txt
@@ -38,19 +38,21 @@ set(DISABLED_WARNINGS
      -Wno-deprecated-declarations \
      -Wno-restrict")
 
-# Disable -Wstringop-overflow to avoid a false positive in the following compiler versions. See
-# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=117983
+# Disable -Wstringop-overflow to avoid a false positive in the following
+# compiler versions. See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=117983
 #
-# NOTE: Typically, this is disabled using a VELOX_SUPPRESS_STRINGOP guard within the code; but that
-# doesn't apply to 3rd-party libraries, so we need to disable it globally for now.
+# NOTE: Typically, this is disabled using a VELOX_SUPPRESS_STRINGOP guard within
+# the code; but that doesn't apply to 3rd-party libraries, so we need to disable
+# it globally for now.
 if("GNU" STREQUAL "${CMAKE_CXX_COMPILER_ID}"
-    AND ((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 12
+   AND ((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 12
          AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.5)
-         OR (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 13
-             AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13.4)
-         OR (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 14
-             AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 14.3)))
-    set(DISABLED_WARNINGS "${DISABLED_WARNINGS} -Wno-stringop-overflow")
+        OR (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 13
+            AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13.4)
+        OR (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 14
+            AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 14.3)
+       ))
+  set(DISABLED_WARNINGS "${DISABLED_WARNINGS} -Wno-stringop-overflow")
 endif()
 
 # Important warnings that must be explicitly enabled.