Fix some additional CRAN issues (#275)

* allow forcing a bundled build

* fix compact array

* maybe fix region covererr

* NEWS

Author: paleolimbot

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: s2
 Title: Spherical Geometry Operators Using the S2 Geometry Library
-Version: 1.1.8
+Version: 1.1.8.9000
 Authors@R: c(
      person(given = "Dewey",
            family = "Dunnington",

NEWS.md

@@ -1,5 +1,17 @@
 # s2 (development version)
 
+* Fix code to help gcc-ubsan understand the region coverer (#275)
+* Inspect `S2_FORCE_BUNDLED_ABSEIL` in `conifigure`: if non-empty, any system
+  install of Abseil is ignored (e.g., if using a non-standard compiler on a
+  system where system Abseil is available via pkg-config) (#275)
+* Disable optimization in compact_array.h that confused compilers when compiling
+  with `-Wpedantic` (#275).
+* Add `cmake` to SystemReqirements. Even though this is technically optional
+  (system Abseil can be used), adding to requirements helps some installers
+  automatically install the dependency (#277).
+
+# s2 1.1.8
+
 * `s2_buffer_cells()` recycles `max_dist` and `min_level` arguments, allowing
    to specify these by feature (#264 and
    https://github.com/r-spatial/sf/issues/2488).

configure

@@ -69,7 +69,7 @@ export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:`pwd`/tools/pkgconfig"
 
 echo "** Using PKG_CONFIG_PATH=${PKG_CONFIG_PATH}"
 
-if pkg-config absl_s2 --libs >/dev/null 2>/dev/null; then
+if [ -z "$S2_FORCE_BUNDLED_ABSEIL" ] && pkg-config absl_s2 --libs >/dev/null 2>/dev/null; then
   echo "** Using abseil-cpp from pkg-config"
 
   PKGCONFIG_CFLAGS=`pkg-config --cflags-only-I absl_s2`

src/s2/s2region_coverer.h

@@ -252,12 +252,15 @@ class S2RegionCoverer {
  private:
   struct Candidate {
     void* operator new(std::size_t size, std::size_t max_children) {
-      return ::operator new (size + max_children * sizeof(Candidate *));
+      // CRAN edit: the sanitizer doesn't understand [0], so we just fix the
+      // size at the
+      // widest possible size.
+      // https://github.com/r-spatial/s2/pull/238
+      // https://github.com/r-spatial/s2/pull/275
+      return ::operator new(size);
     }
 
-    void operator delete(void* p) {
-      ::operator delete (p);
-    }
+    void operator delete(void* p) { ::operator delete(p); }
 
     Candidate(const S2Cell& cell, const std::size_t max_children)
         : cell(cell), is_terminal(max_children == 0) {
@@ -270,9 +273,12 @@ class S2RegionCoverer {
     ~Candidate() = default;
 
     S2Cell cell;
-    bool is_terminal;        // Cell should not be expanded further.
-    int num_children = 0;    // Number of children that intersect the region.
-    __extension__ Candidate* children[0];  // Actual size may be 0, 4, 16, or 64 elements.
+    bool is_terminal;      // Cell should not be expanded further.
+    int num_children = 0;  // Number of children that intersect the region.
+    // CRAN edit: the sanitizer doesn't understand [0], so we just fix the size
+    // at the widest possible size. https://github.com/r-spatial/s2/pull/238
+    // https://github.com/r-spatial/s2/pull/275
+    Candidate* children[64];  // Actual size may be 0, 4, 16, or 64 elements.
   };
 
   // If the cell intersects the given region, return a new candidate with no
@@ -347,7 +353,8 @@ class S2RegionCoverer {
     }
   };
   typedef std::priority_queue<QueueEntry, std::vector<QueueEntry>,
-                              CompareQueueEntries> CandidateQueue;
+                              CompareQueueEntries>
+      CandidateQueue;
   CandidateQueue pq_;
 
   // True if we're computing an interior covering.

src/s2/util/gtl/compact_array.h

@@ -89,7 +89,8 @@ class compact_array_base {
 #endif
 
   // Opportunistically consider allowing inlined elements.
-#if defined(_LP64) && defined(__GNUC__)
+  // Edit for CRAN: This is not supported by -Wpedantic
+#if false && defined(_LP64) && defined(__GNUC__)
   // With 64-bit pointers, our approach is to form a 16-byte struct:
   //   [5 bytes for size, capacity, is_exponent and is_inlined]
   //   [3 bytes of padding or inlined elements]

tools/vendor/abseil-cpp/absl/copts/GENERATED_AbseilCopts.cmake

@@ -225,5 +225,4 @@ list(APPEND ABSL_RANDOM_HWAES_MSVC_X64_FLAGS
 
 list(APPEND ABSL_RANDOM_HWAES_X64_FLAGS
     "-maes"
-    "-msse4.1"
 )