[libcxxabi] [llvm] [ItaniumDemangle][NFC] Rename argument to not conflict with Android's NDK sysroot (PR #179079)

[Sharjeel Khan via llvm-commits]

https://github.com/Sharjeel-Khan updated https://github.com/llvm/llvm-project/pull/179079

>From 17b8810ad4539b294dabbc3807514097ba9ed75f Mon Sep 17 00:00:00 2001
From: Sharjeel Khan <sharjeelkhan at google.com>
Date: Sat, 31 Jan 2026 20:58:17 +0000
Subject: [PATCH 1/2] [ItaniumDemangle][NFC] Rename argument to not conflict
 with Android's NDK sysroot

SS in x86 architecture typically represents the Stack Segment register
so SS is typically defined in ptrace_abi.h. As a result, in our i686
Android build, the argument SS is getting confused with the define in
ptrace_abi.h. I am just renaming the argument to fix the issue and the
change does not cause any functional change.

Error:
/tmpfs/src/git/test/llvm-project/llvm/include/llvm/Demangle/ItaniumDemangle.h:1754:32:
error: expected ')'
 1754 |     SpecialSubstitution const *SS)
      |                                ^
/tmpfs/src/git/test/sysroots/ndk/x86/usr/include/i686-linux-android/asm/ptrace-abi.h:26:12:
note: expanded from macro 'SS'
   26 | #define SS 16
      |            ^
---
 llvm/include/llvm/Demangle/ItaniumDemangle.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/llvm/include/llvm/Demangle/ItaniumDemangle.h b/llvm/include/llvm/Demangle/ItaniumDemangle.h
index 67de123fdbad5..fdb30a91aeb79 100644
--- a/llvm/include/llvm/Demangle/ItaniumDemangle.h
+++ b/llvm/include/llvm/Demangle/ItaniumDemangle.h
@@ -1751,8 +1751,8 @@ class SpecialSubstitution final : public ExpandedSpecialSubstitution {
 };
 
 inline ExpandedSpecialSubstitution::ExpandedSpecialSubstitution(
-    SpecialSubstitution const *SS)
-    : ExpandedSpecialSubstitution(SS->SSK) {}
+    SpecialSubstitution const *SSub)
+    : ExpandedSpecialSubstitution(SSub->SSK) {}
 
 class CtorDtorName final : public Node {
   const Node *Basename;

>From 763182905bcb6c1651396fffb529997d95cfe9c4 Mon Sep 17 00:00:00 2001
From: Sharjeel Khan <sharjeelkhan at google.com>
Date: Sun, 1 Feb 2026 01:32:25 +0000
Subject: [PATCH 2/2] Update libcxxabi's ItaniumDemangle.h to be the same as
 llvm's ItaniumDemangle.h

---
 libcxxabi/src/demangle/ItaniumDemangle.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libcxxabi/src/demangle/ItaniumDemangle.h b/libcxxabi/src/demangle/ItaniumDemangle.h
index b999438ff2ca8..b2e3a2bc8871b 100644
--- a/libcxxabi/src/demangle/ItaniumDemangle.h
+++ b/libcxxabi/src/demangle/ItaniumDemangle.h
@@ -1751,8 +1751,8 @@ class SpecialSubstitution final : public ExpandedSpecialSubstitution {
 };
 
 inline ExpandedSpecialSubstitution::ExpandedSpecialSubstitution(
-    SpecialSubstitution const *SS)
-    : ExpandedSpecialSubstitution(SS->SSK) {}
+    SpecialSubstitution const *SSub)
+    : ExpandedSpecialSubstitution(SSub->SSK) {}
 
 class CtorDtorName final : public Node {
   const Node *Basename;