Merge pull request google#41 from getsentry/chore/update_2025_06_13

chore: upstream update 2025-06-13

Author: JoshuaMoelans

.gitattributes

@@ -0,0 +1 @@
+src/processor/testdata/*.out text eol=lf

DEPS

@@ -36,7 +36,7 @@ deps = {
   # Testing libraries and utilities.
   "src/src/testing":
     "https://github.com/google/googletest.git" +
-      "@release-1.11.0",
+      "@v1.16.0",
 
   # Protobuf.
   "src/src/third_party/protobuf/protobuf":
@@ -46,7 +46,7 @@ deps = {
   # Linux syscall support.
   "src/src/third_party/lss":
     "https://chromium.googlesource.com/linux-syscall-support/" +
-      "@9719c1e1e676814c456b55f5f070eabad6709d31",
+      "@ed31caa60f20a4f6569883b2d752ef7522de51e0",
 }
 
 hooks = [

Makefile.in

@@ -2691,11 +2691,13 @@ src_tools_linux_dump_syms_dump_syms_SOURCES = \
 	src/tools/linux/dump_syms/dump_syms.cc
 
 src_tools_linux_dump_syms_dump_syms_CXXFLAGS = \
-	$(RUSTC_DEMANGLE_CFLAGS)
+	$(RUSTC_DEMANGLE_CFLAGS) \
+	$(ZSTD_CFLAGS)
 
 src_tools_linux_dump_syms_dump_syms_LDADD = \
 	$(RUSTC_DEMANGLE_LIBS) \
-	-lz -lzstd
+	$(ZSTD_CFLAGS) \
+	-lz
 
 src_tools_linux_md2core_minidump_2_core_SOURCES = \
 	src/common/linux/memory_mapped_file.cc \
@@ -2822,13 +2824,15 @@ src_common_dumper_unittest_SOURCES = \
 src_common_dumper_unittest_CPPFLAGS = \
 	$(AM_CPPFLAGS) $(TEST_CFLAGS) \
 	$(RUSTC_DEMANGLE_CFLAGS) \
-	$(PTHREAD_CFLAGS)
+	$(PTHREAD_CFLAGS) \
+	$(ZSTD_CFLAGS)
 
 src_common_dumper_unittest_LDADD = \
 	$(TEST_LIBS) \
 	$(RUSTC_DEMANGLE_LIBS) \
 	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS) \
-	-lz -lzstd
+	$(ZSTD_LIBS) \
+	-lz
 
 src_common_mac_macho_reader_unittest_SOURCES = \
 	src/common/dwarf_cfi_to_module.cc \

OWNERS

@@ -11,3 +11,6 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
+
+# Allow autoroller to update our DEPS file automatically.
+per-file DEPS=*

android/sample_app/jni/test_breakpad.cpp

@@ -41,16 +41,16 @@ bool DumpCallback(const google_breakpad::MinidumpDescriptor& descriptor,
 }
 
 void Crash() {
-  volatile int* a = reinterpret_cast<volatile int*>(NULL);
+  volatile int* a = static_cast<volatile int*>(nullptr);
   *a = 1;
 }
 
 }  // namespace
 
 int main(int argc, char* argv[]) {
   google_breakpad::MinidumpDescriptor descriptor(".");
-  google_breakpad::ExceptionHandler eh(descriptor, NULL, DumpCallback,
-                                       NULL, true, -1);
+  google_breakpad::ExceptionHandler eh(descriptor, nullptr, DumpCallback,
+                                       nullptr, true, -1);
   Crash();
   return 0;
 }

configure

@@ -675,7 +675,7 @@ ANDROID_HOST_TRUE
 LINUX_HOST_FALSE
 LINUX_HOST_TRUE
 WARN_CXXFLAGS
-HAVE_CXX17
+HAVE_CXX20
 HAVE_MEMFD_CREATE_FALSE
 HAVE_MEMFD_CREATE_TRUE
 HAVE_GETCONTEXT_FALSE
@@ -7594,17 +7594,17 @@ fi
 
 
 
-  ax_cxx_compile_alternatives="17 1z"    ax_cxx_compile_cxx17_required=true
+  ax_cxx_compile_alternatives="20"    ax_cxx_compile_cxx20_required=true
   ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
   ac_success=no
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++17 features by default" >&5
-printf %s "checking whether $CXX supports C++17 features by default... " >&6; }
-if test ${ax_cv_cxx_compile_cxx17+y}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++20 features by default" >&5
+printf %s "checking whether $CXX supports C++20 features by default... " >&6; }
+if test ${ax_cv_cxx_compile_cxx20+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
@@ -8400,27 +8400,53 @@ namespace cxx17
 
 
 
+
+#ifndef __cplusplus
+
+#error "This is not a C++ compiler"
+
+#elif __cplusplus < 202002L && !defined _MSC_VER
+
+#error "This is not a C++20 compiler"
+
+#else
+
+#include <version>
+
+namespace cxx20
+{
+
+// As C++20 supports feature test macros in the standard, there is no
+// immediate need to actually test for feature availability on the
+// Autoconf side.
+
+}  // namespace cxx20
+
+#endif  // __cplusplus < 202002L && !defined _MSC_VER
+
+
+
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"
 then :
-  ax_cv_cxx_compile_cxx17=yes
+  ax_cv_cxx_compile_cxx20=yes
 else $as_nop
-  ax_cv_cxx_compile_cxx17=no
+  ax_cv_cxx_compile_cxx20=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_compile_cxx17" >&5
-printf "%s\n" "$ax_cv_cxx_compile_cxx17" >&6; }
-    if test x$ax_cv_cxx_compile_cxx17 = xyes; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_compile_cxx20" >&5
+printf "%s\n" "$ax_cv_cxx_compile_cxx20" >&6; }
+    if test x$ax_cv_cxx_compile_cxx20 = xyes; then
       ac_success=yes
     fi
 
     if test x$ac_success = xno; then
     for alternative in ${ax_cxx_compile_alternatives}; do
       switch="-std=gnu++${alternative}"
-      cachevar=`printf "%s\n" "ax_cv_cxx_compile_cxx17_$switch" | $as_tr_sh`
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++17 features with $switch" >&5
-printf %s "checking whether $CXX supports C++17 features with $switch... " >&6; }
+      cachevar=`printf "%s\n" "ax_cv_cxx_compile_cxx20_$switch" | $as_tr_sh`
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++20 features with $switch" >&5
+printf %s "checking whether $CXX supports C++20 features with $switch... " >&6; }
 if eval test \${$cachevar+y}
 then :
   printf %s "(cached) " >&6
@@ -9219,6 +9245,32 @@ namespace cxx17
 
 
 
+
+#ifndef __cplusplus
+
+#error "This is not a C++ compiler"
+
+#elif __cplusplus < 202002L && !defined _MSC_VER
+
+#error "This is not a C++20 compiler"
+
+#else
+
+#include <version>
+
+namespace cxx20
+{
+
+// As C++20 supports feature test macros in the standard, there is no
+// immediate need to actually test for feature availability on the
+// Autoconf side.
+
+}  // namespace cxx20
+
+#endif  // __cplusplus < 202002L && !defined _MSC_VER
+
+
+
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"
 then :
@@ -9246,9 +9298,9 @@ printf "%s\n" "$ac_res" >&6; }
     if test x$ac_success = xno; then
                 for alternative in ${ax_cxx_compile_alternatives}; do
       for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do
-        cachevar=`printf "%s\n" "ax_cv_cxx_compile_cxx17_$switch" | $as_tr_sh`
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++17 features with $switch" >&5
-printf %s "checking whether $CXX supports C++17 features with $switch... " >&6; }
+        cachevar=`printf "%s\n" "ax_cv_cxx_compile_cxx20_$switch" | $as_tr_sh`
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++20 features with $switch" >&5
+printf %s "checking whether $CXX supports C++20 features with $switch... " >&6; }
 if eval test \${$cachevar+y}
 then :
   printf %s "(cached) " >&6
@@ -10047,6 +10099,32 @@ namespace cxx17
 
 
 
+
+#ifndef __cplusplus
+
+#error "This is not a C++ compiler"
+
+#elif __cplusplus < 202002L && !defined _MSC_VER
+
+#error "This is not a C++20 compiler"
+
+#else
+
+#include <version>
+
+namespace cxx20
+{
+
+// As C++20 supports feature test macros in the standard, there is no
+// immediate need to actually test for feature availability on the
+// Autoconf side.
+
+}  // namespace cxx20
+
+#endif  // __cplusplus < 202002L && !defined _MSC_VER
+
+
+
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"
 then :
@@ -10080,19 +10158,19 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-  if test x$ax_cxx_compile_cxx17_required = xtrue; then
+  if test x$ax_cxx_compile_cxx20_required = xtrue; then
     if test x$ac_success = xno; then
-      as_fn_error $? "*** A compiler with support for C++17 language features is required." "$LINENO" 5
+      as_fn_error $? "*** A compiler with support for C++20 language features is required." "$LINENO" 5
     fi
   fi
   if test x$ac_success = xno; then
-    HAVE_CXX17=0
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: No compiler with C++17 support was found" >&5
-printf "%s\n" "$as_me: No compiler with C++17 support was found" >&6;}
+    HAVE_CXX20=0
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: No compiler with C++20 support was found" >&5
+printf "%s\n" "$as_me: No compiler with C++20 support was found" >&6;}
   else
-    HAVE_CXX17=1
+    HAVE_CXX20=1
 
-printf "%s\n" "#define HAVE_CXX17 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CXX20 1" >>confdefs.h
 
   fi
 

configure.ac

@@ -66,7 +66,7 @@ AC_CHECK_FUNCS([arc4random getcontext getrandom memfd_create])
 AM_CONDITIONAL([HAVE_GETCONTEXT], [test "x$ac_cv_func_getcontext" = xyes])
 AM_CONDITIONAL([HAVE_MEMFD_CREATE], [test "x$ac_cv_func_memfd_create" = xyes])
 
-AX_CXX_COMPILE_STDCXX(17, , mandatory)
+AX_CXX_COMPILE_STDCXX(20, , mandatory)
 
 dnl Test supported warning flags.
 WARN_CXXFLAGS=

default.xml

@@ -7,32 +7,32 @@
            sync-c='true'
            sync-j='8' />
 
-  <remote  name='github'
-           fetch='https://github.com/'
-           review='' />
-
   <remote  name='chromium'
            fetch='https://chromium.googlesource.com/'
            review='https://chromium-review.googlesource.com' />
 
+  <remote  name='github'
+           fetch='https://github.com/'
+           review='' />
+
   <project path='src'
            name='breakpad/breakpad'
            revision='refs/heads/main'
            remote='chromium' />
 
   <project path='src/src/testing'
            name='google/googletest.git'
-           revision='refs/tags/release-1.11.0'
+           revision='refs/tags/v1.16.0'
            remote='github' />
 
-  <project path='src/src/third_party/lss'
-           name='linux-syscall-support/'
-           revision='9719c1e1e676814c456b55f5f070eabad6709d31'
-           remote='chromium' />
-
   <project path='src/src/third_party/protobuf/protobuf'
            name='google/protobuf.git'
            revision='cb6dd4ef5f82e41e06179dcd57d3b1d9246ad6ac'
            remote='github' />
 
+  <project path='src/src/third_party/lss'
+           name='linux-syscall-support/'
+           revision='ed31caa60f20a4f6569883b2d752ef7522de51e0'
+           remote='chromium' />
+
 </manifest>

src/client/ios/exception_handler_no_mach.cc

@@ -30,9 +30,12 @@
 #include <config.h>  // Must come first
 #endif
 
+#include <assert.h>
 #include <signal.h>
 #include <TargetConditionals.h>
 
+#include <memory>
+
 #include "client/mac/handler/minidump_generator.h"
 #include "client/ios/exception_handler_no_mach.h"
 
@@ -65,7 +68,7 @@ const int kExceptionSignals[] = {
 };
 const int kNumHandledSignals =
     sizeof(kExceptionSignals) / sizeof(kExceptionSignals[0]);
-struct scoped_ptr<struct sigaction> old_handlers[kNumHandledSignals];
+struct std::unique_ptr<struct sigaction> old_handlers[kNumHandledSignals];
 
 static union {
 #if USE_PROTECTED_ALLOCATIONS

src/client/ios/exception_handler_no_mach.h

@@ -35,7 +35,6 @@
 #include <string>
 
 #include "client/mac/handler/ucontext_compat.h"
-#include "common/scoped_ptr.h"
 
 namespace google_breakpad {