From: Markus Metzger <markus.t.metzger@intel.com>
Date: Wed, 17 Dec 2025 05:34:09 +0000 (+0000)
Subject: gdb, btrace: fix assert with gcc-15
X-Git-Url: https://git.feebdaed.xyz/?a=commitdiff_plain;h=2b8ae83dfe1e1d74d12178dd884c51858d23e1f3;p=0xmirror%2Fbinutils-gdb.git

gdb, btrace: fix assert with gcc-15

This fixes

/usr/include/c++/15/optional:1186: constexpr _Tp& std::optional<_Tp>::operator*() & [with _Tp = std::__cxx11::basic_string<char>]: Assertion 'this->_M_is_engaged()' failed.

encountered in gdb.btrace/ptwrite.exp.

Approved-By: Simon Marchi <simon.marchi@efficios.com>
---

diff --git a/gdb/btrace.c b/gdb/btrace.c
index b5516a1499c..b7c26573404 100644
--- a/gdb/btrace.c
+++ b/gdb/btrace.c
@@ -1393,7 +1393,7 @@ handle_pt_insn_events (struct btrace_thread_info *btinfo,
 	      continue;
 
 	    if (!ptw_string.has_value ())
-	      *ptw_string = hex_string (event.variant.ptwrite.payload);
+	      ptw_string = hex_string (event.variant.ptwrite.payload);
 
 	    handle_pt_aux_insn (btinfo, *ptw_string, pc);