Merge pull request swiftlang#32217 from bitjammer/acgarland/rdar-63120829-show-in-interface-not-underscored

[SymbolGraph] Don't consider @show_in_interface for underscored names

Author: bitjammer

lib/AST/Decl.cpp

@@ -738,9 +738,6 @@ bool Decl::hasUnderscoredNaming() const {
   }
 
   if (const auto PD = dyn_cast<ProtocolDecl>(D)) {
-    if (PD->getAttrs().hasAttribute<ShowInInterfaceAttr>()) {
-      return false;
-    }
     StringRef NameStr = PD->getNameStr();
     if (NameStr.startswith("_Builtin")) {
       return true;
@@ -797,6 +794,10 @@ bool Decl::isPrivateStdlibDecl(bool treatNonBuiltinProtocolsAsPublic) const {
       return false;
   }
 
+  if (D->getAttrs().hasAttribute<ShowInInterfaceAttr>()) {
+    return false;
+  }
+
   return hasUnderscoredNaming();
 }
 

test/SymbolGraph/Symbols/SkipsPublicUnderscore.swift

@@ -7,6 +7,7 @@ public protocol PublicProtocol {}
 
 // CHECK-NOT: precise:{{.*}}_ProtocolShouldntAppear
 // CHECK-NOT: precise:{{.*}}PublicProtocol
+@_show_in_interface
 public protocol _ProtocolShouldntAppear {}
 
 // CHECK-NOT: _ShouldntAppear