Merge pull request #42497 from apple/QuietMisdreavus/5.7-04182022/new-symbols

[5.7-04182022][SymbolGraphGen] skip underscored implicit Clang decls

Author: DougGregor

lib/SymbolGraphGen/SymbolGraph.cpp

@@ -583,6 +583,12 @@ bool SymbolGraph::isImplicitlyPrivate(const Decl *D,
 
   // Don't record effectively internal declarations if specified
   if (D->hasUnderscoredNaming()) {
+    // Some implicit decls from Clang with underscored names sneak in, so throw those out
+    if (const auto *clangD = D->getClangDecl()) {
+      if (clangD->isImplicit())
+        return true;
+    }
+
     AccessLevel symLevel = AccessLevel::Public;
     if (const ValueDecl *VD = dyn_cast<ValueDecl>(D)) {
       symLevel = VD->getFormalAccess();

test/SymbolGraph/ClangImporter/BridgingHeader.swift

@@ -0,0 +1,15 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-pch -pch-output-dir %t %S/Inputs/ObjcProperty/ObjcProperty.framework/Headers/ObjcProperty.h
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-objc-interop -emit-module-path %t/BridgingHeader.swiftmodule -import-objc-header %S/Inputs/ObjcProperty/ObjcProperty.framework/Headers/ObjcProperty.h -pch-output-dir %t -module-name BridgingHeader -disable-objc-attr-requires-foundation-module %s -emit-symbol-graph -emit-symbol-graph-dir %t -symbol-graph-minimum-access-level internal
+
+// RUN: %FileCheck %s --input-file %t/BridgingHeader.symbols.json
+
+// REQUIRES: objc_interop
+
+// There are a few implicit symbols from Clang that snuck in when building with minimum-access
+// level of "internal". Make sure they don't sneak back in. rdar://92018648
+
+// CHECK-NOT: __NSConstantString
+// CHECK-NOT: __builtin_ms_va_list
+// CHECK-NOT: __builtin_va_list
+