SFINAE substitutions reset NestedNameSpecifier

#fix fix #774
cppalliance · Jan 14, 2025 · e4a2a00 · e4a2a00
1 parent 80a9509
commit e4a2a00
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 9 deletions.
diff --git a/src/lib/AST/TerminalTypeVisitor.hpp b/src/lib/AST/TerminalTypeVisitor.hpp
@@ -85,7 +85,7 @@ class TerminalTypeVisitor
     bool IsPack_ = false;
 
     // The optional NestedNameSpecifier.
-    const NestedNameSpecifier* NNS_;
+    const NestedNameSpecifier* NNS_ = nullptr;
 
 public:
     /** Constructor for TerminalTypeVisitor.
@@ -570,7 +570,8 @@ class TerminalTypeVisitor
     {
         if (auto SFINAE = getASTVisitor().extractSFINAEInfo(T))
         {
-            return getDerived().Visit(SFINAE->first);
+            NNS_ = nullptr;
+            return getDerived().Visit(SFINAE->Type);
         }
 
         if (auto const* NNS = T->getQualifier())
@@ -604,7 +605,8 @@ class TerminalTypeVisitor
         MRDOCS_SYMBOL_TRACE(T, Visitor_.context_);
         if (auto SFINAE = getASTVisitor().extractSFINAEInfo(T))
         {
-            return getDerived().Visit(SFINAE->first);
+            NNS_ = nullptr;
+            return getDerived().Visit(SFINAE->Type);
         }
 
         // In most cases, a template name is simply a reference

diff --git a/test-files/golden-tests/core/libcxx.adoc b/test-files/golden-tests/core/libcxx.adoc
@@ -34,7 +34,7 @@ Declared in `&lt;libcxx&period;cpp&gt;`
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
 template&lt;typename T&gt;
-<<std,std>>::T
+T
 sqrt(T value);
 ----
 

diff --git a/test-files/golden-tests/core/libcxx.html b/test-files/golden-tests/core/libcxx.html
@@ -40,7 +40,7 @@ <h3>Synopsis</h3>
 <pre>
 <code class="source-code cpp">
 template&lt;typename T&gt;
-<a href="#std">std</a>::T
+T
 sqrt(T value);
 </code>
 </pre>

diff --git a/test-files/golden-tests/core/libcxx.xml b/test-files/golden-tests/core/libcxx.xml
@@ -7,7 +7,7 @@
     <function name="sqrt" id="ulFDUE1svTCX8fV/h8EIp4NNbWs=">
       <file path="libcxx.cpp" line="149"/>
       <return>
-        <type name="std::T"/>
+        <type name="T"/>
       </return>
       <param name="value">
         <type name="T"/>

diff --git a/test-files/golden-tests/snippets/sqrt.adoc b/test-files/golden-tests/snippets/sqrt.adoc
@@ -34,7 +34,7 @@ Declared in `&lt;sqrt&period;cpp&gt;`
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
 template&lt;typename T&gt;
-<<std,std>>::T
+T
 sqrt(T value);
 ----
 

diff --git a/test-files/golden-tests/snippets/sqrt.html b/test-files/golden-tests/snippets/sqrt.html
@@ -40,7 +40,7 @@ <h3>Synopsis</h3>
 <pre>
 <code class="source-code cpp">
 template&lt;typename T&gt;
-<a href="#std">std</a>::T
+T
 sqrt(T value);
 </code>
 </pre>

diff --git a/test-files/golden-tests/snippets/sqrt.xml b/test-files/golden-tests/snippets/sqrt.xml
@@ -7,7 +7,7 @@
     <function name="sqrt" id="ulFDUE1svTCX8fV/h8EIp4NNbWs=">
       <file path="sqrt.cpp" line="15" class="def"/>
       <return>
-        <type name="std::T"/>
+        <type name="T"/>
       </return>
       <param name="value">
         <type name="T"/>