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

[via libcxx-commits]

llvmbot wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-libcxxabi

Author: Sharjeel Khan (Sharjeel-Khan)

<details>
<summary>Changes</summary>

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
      |            ^
```

---
Full diff: https://github.com/llvm/llvm-project/pull/179079.diff


2 Files Affected:

- (modified) libcxxabi/src/demangle/ItaniumDemangle.h (+2-2) 
- (modified) llvm/include/llvm/Demangle/ItaniumDemangle.h (+2-2) 


``````````diff
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;
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;

``````````

</details>


https://github.com/llvm/llvm-project/pull/179079