summaryrefslogtreecommitdiffstats
path: root/contrib/restricted/abseil-cpp/absl/debugging/internal
diff options
context:
space:
mode:
authorrobot-contrib <[email protected]>2025-03-19 22:16:45 +0300
committerrobot-contrib <[email protected]>2025-03-19 22:39:23 +0300
commit842d4aa77a13f834213769e8a84762ba2cd48678 (patch)
tree761515108702b0cd008e72b74e8b8dabe975964b /contrib/restricted/abseil-cpp/absl/debugging/internal
parentac4c6f13e09afd3b8118cb869891d54a23aabaeb (diff)
Update contrib/restricted/abseil-cpp to 20250127.1
commit_hash:ba806fade44cb61f6f4e597654b5ffe8b1e5b999
Diffstat (limited to 'contrib/restricted/abseil-cpp/absl/debugging/internal')
-rw-r--r--contrib/restricted/abseil-cpp/absl/debugging/internal/demangle.cc6
-rw-r--r--contrib/restricted/abseil-cpp/absl/debugging/internal/stacktrace_aarch64-inl.inc4
2 files changed, 7 insertions, 3 deletions
diff --git a/contrib/restricted/abseil-cpp/absl/debugging/internal/demangle.cc b/contrib/restricted/abseil-cpp/absl/debugging/internal/demangle.cc
index caac76367f0..f7de117b201 100644
--- a/contrib/restricted/abseil-cpp/absl/debugging/internal/demangle.cc
+++ b/contrib/restricted/abseil-cpp/absl/debugging/internal/demangle.cc
@@ -2816,7 +2816,8 @@ static bool ParseLocalNameSuffix(State *state) {
// On late parse failure, roll back not only the input but also the output,
// whose trailing NUL was overwritten.
state->parse_state = copy;
- if (state->parse_state.append) {
+ if (state->parse_state.append &&
+ state->parse_state.out_cur_idx < state->out_end_idx) {
state->out[state->parse_state.out_cur_idx] = '\0';
}
return false;
@@ -2829,7 +2830,8 @@ static bool ParseLocalNameSuffix(State *state) {
return true;
}
state->parse_state = copy;
- if (state->parse_state.append) {
+ if (state->parse_state.append &&
+ state->parse_state.out_cur_idx < state->out_end_idx) {
state->out[state->parse_state.out_cur_idx] = '\0';
}
diff --git a/contrib/restricted/abseil-cpp/absl/debugging/internal/stacktrace_aarch64-inl.inc b/contrib/restricted/abseil-cpp/absl/debugging/internal/stacktrace_aarch64-inl.inc
index 4490c4e13ca..dccadaeb7c2 100644
--- a/contrib/restricted/abseil-cpp/absl/debugging/internal/stacktrace_aarch64-inl.inc
+++ b/contrib/restricted/abseil-cpp/absl/debugging/internal/stacktrace_aarch64-inl.inc
@@ -188,7 +188,9 @@ inline void* ClearPacBits(void* ptr) {
// compatibility with ARM platforms that do not support pointer
// authentication, we use the hint space instruction XPACLRI instead. Hint
// space instructions behave as NOPs on unsupported platforms.
- asm("xpaclri" : "+r"(x30));
+#define ABSL_XPACLRI_HINT "hint #0x7;"
+ asm(ABSL_XPACLRI_HINT : "+r"(x30)); // asm("xpaclri" : "+r"(x30));
+#undef ABSL_XPACLRI_HINT
return x30;
}