Merge branch 'master' into remove-openssl

Author: smcallis

.github/workflows/bazel.yml

@@ -0,0 +1,47 @@
+name: Bazel CI
+
+on:
+  pull_request:
+  push:
+  release:
+    types:
+      - released
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+
+permissions: read-all
+
+jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+
+    # We would like to test on the oldest and newest supported.
+    # https://github.com/google/oss-policies-info/blob/main/foundational-cxx-support-matrix.md
+    # https://bazel.build/release#support-matrix
+    # It's not clear how to do that since bazelisk has some magic to pick a
+    # bazel version.
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8  # v5.0.0
+
+    - name: Setup Bazel ${{ matrix.bazel }}
+      uses: bazel-contrib/setup-bazel@4fd964a13a440a8aeb0be47350db2fc640f19ca8  # v0.15.0
+      with:
+        # Avoid downloading Bazel every time.
+        bazelisk-cache: true
+        # Store build cache per workflow.
+        disk-cache: ${{ github.workflow }}
+        # Share repository cache between workflows.
+        repository-cache: true
+
+    - name: Build and Test
+      run: |
+        bazel test \
+          --jobs=45 --keep_going \
+          --test_verbose_timeout_warnings --test_output=errors \
+          //...
+      working-directory: src

.github/workflows/build.yml

@@ -32,7 +32,7 @@ jobs:
     runs-on: ${{ matrix.runs-on }}
     timeout-minutes: 30
     steps:
-      - uses: zacharyburnett/setup-abseil-cpp@713a4383f10b05948a6d9d4906056063c8da1168 # Not a release, but has #423 fix.
+      - uses: zacharyburnett/setup-abseil-cpp@4189ecb9fcc7441ed7536774fb0a3f04d3cb779a # Not a release, but has #423 fix.
         with:
           cmake-build-args: "-DCMAKE_CXX_STANDARD=17 -DABSL_PROPAGATE_CXX_STD=ON -DABSL_ENABLE_INSTALL=ON -DBUILD_TESTING=off -DCMAKE_POSITION_INDEPENDENT_CODE=ON"
           abseil-version: "20250814.1"

.github/workflows/test.yml

@@ -33,7 +33,7 @@ jobs:
     runs-on: ${{ matrix.runs-on }}
     timeout-minutes: 30
     steps:
-      - uses: zacharyburnett/setup-abseil-cpp@713a4383f10b05948a6d9d4906056063c8da1168 # Not a release, but has #423 fix.
+      - uses: zacharyburnett/setup-abseil-cpp@4189ecb9fcc7441ed7536774fb0a3f04d3cb779a # Not a release, but has #423 fix.
         with:
           cmake-build-args: "-DCMAKE_CXX_STANDARD=17 -DABSL_PROPAGATE_CXX_STD=ON -DABSL_ENABLE_INSTALL=ON -DBUILD_TESTING=off -DCMAKE_POSITION_INDEPENDENT_CODE=ON"
           abseil-version: "20250814.1"

CMakeLists.txt

@@ -90,7 +90,7 @@ else()
     # match [-Wattributes]
     add_definitions(-Wno-attributes)
     add_definitions(-Wno-deprecated-declarations)
-    # `base/port.h` uses sized deallocation, which should be enabled by
+    # Some files use sized deallocation, which should be enabled by
     # default for C++14 and later.  There appears to be a bug with clang
     # < 19 causing this not to be enabled.
     # https://github.com/google/s2geometry/issues/411#issuecomment-2726949607
@@ -428,11 +428,8 @@ if(S2_ENABLE_INSTALL)
                 src/s2/internal/s2meta.h
           DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/s2/internal")
   install(FILES src/s2/base/casts.h
-                src/s2/base/commandlineflags.h
-                src/s2/base/commandlineflags_declare.h
                 src/s2/base/log_severity.h
                 src/s2/base/malloc_extension.h
-                src/s2/base/port.h
                 src/s2/base/spinlock.h
           DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/s2/base")
   install(FILES src/s2/testing/gtest_prod.h
@@ -618,9 +615,10 @@ if (BUILD_TESTS)
       src/s2/s2winding_operation_test.cc
       src/s2/s2wrapped_shape_test.cc
       src/s2/sequence_lexicon_test.cc
+      src/s2/value_lexicon_test.cc
       src/s2/util/math/exactfloat/bignum_test.cc
       src/s2/util/math/exactfloat/exactfloat_test.cc
-      src/s2/value_lexicon_test.cc)
+      src/s2/util/math/exactfloat/exactfloat_underflow_test.cc)
 
   enable_testing()
 

doc/examples/point_index.cc

@@ -9,18 +9,18 @@
 #include <random>
 #include <vector>
 
-#include "s2/base/commandlineflags.h"
-#include "s2/s2earth.h"
 #include "absl/flags/flag.h"
 #include "absl/strings/str_format.h"
+
 #include "s2/s1angle.h"
 #include "s2/s2closest_point_query.h"
+#include "s2/s2earth.h"
 #include "s2/s2point_index.h"
 #include "s2/s2random.h"
 
-S2_DEFINE_int32(num_index_points, 10000, "Number of points to index");
-S2_DEFINE_int32(num_queries, 10000, "Number of queries");
-S2_DEFINE_double(query_radius_km, 100, "Query radius in kilometers");
+ABSL_FLAG(int32_t, num_index_points, 10000, "Number of points to index");
+ABSL_FLAG(int32_t, num_queries, 10000, "Number of queries");
+ABSL_FLAG(double, query_radius_km, 100, "Query radius in kilometers");
 
 int main(int argc, char **argv) {
   std::mt19937_64 bitgen;

doc/examples/term_index.cc

@@ -16,23 +16,20 @@
 #include <string>
 #include <vector>
 
-#include "s2/base/commandlineflags.h"
-#include "s2/s2earth.h"
 #include "absl/container/btree_set.h"
 #include "absl/container/flat_hash_map.h"
 #include "absl/flags/flag.h"
 #include "absl/strings/str_format.h"
 #include "s2/s1angle.h"
 #include "s2/s2cap.h"
+#include "s2/s2earth.h"
 #include "s2/s2point.h"
 #include "s2/s2random.h"
 #include "s2/s2region_term_indexer.h"
 
-using std::string;
-
-S2_DEFINE_int32(num_documents, 10000, "Number of documents");
-S2_DEFINE_int32(num_queries, 10000, "Number of queries");
-S2_DEFINE_double(query_radius_km, 100, "Query radius in kilometers");
+ABSL_FLAG(int32_t, num_documents, 10000, "Number of documents");
+ABSL_FLAG(int32_t, num_queries, 10000, "Number of queries");
+ABSL_FLAG(double, query_radius_km, 100, "Query radius in kilometers");
 
 // A prefix added to spatial terms to distinguish them from other index terms
 // (e.g. representing words or phrases).

src/BUILD.bazel

@@ -236,9 +236,7 @@ cc_library(
         "//s2:value_lexicon.h",
     ],
     deps = [
-        "//s2/base:commandlineflags",
         "//s2/base:logging",
-        "//s2/base:port",
         "//s2/base:spinlock",
         "//s2/testing",
         "//s2/util/bitmap",
@@ -387,7 +385,6 @@ cc_library(
     includes = ["src"],
     deps = [
         ":s2",
-        "//s2/base:commandlineflags",
         "//s2/base:timer",
         "@abseil-cpp//absl/base",
         "@abseil-cpp//absl/flags:flag",

src/s2/_fp_contract_off.h

@@ -41,13 +41,14 @@
 // appears before the first non-inline function definition.  It is
 // named with an underscore so that it is included first among the S2 headers.
 
-// Assume all compilers support or ignore the standard pragma.
-#pragma STDC FP_CONTRACT OFF
-
 #if defined(__GNUC__) && !defined(__clang__)
 // GCC defines its own pragma that operates at the function level rather than
 // the statement level.
 #pragma GCC optimize("fp-contract=off")
+#else
+// Assume all other compilers support or ignore the standard pragma.
+// Avoid gcc `-Wunknown-pragmas` warnings by not using this for gcc.
+#pragma STDC FP_CONTRACT OFF
 #endif
 
 #endif  // S2__FP_CONTRACT_OFF_H_

src/s2/base/BUILD

@@ -29,22 +29,6 @@ cc_library(
     ],
 )
 
-cc_library(
-    name = "port",
-    hdrs = ["port.h"],
-)
-
-cc_library(
-    name = "commandlineflags",
-    hdrs = [
-        "commandlineflags.h",
-        "commandlineflags_declare.h",
-    ],
-    deps = [
-        "@abseil-cpp//absl/flags:flag",
-    ],
-)
-
 cc_library(
     name = "timer",
     hdrs = [