Merge pull request #38394 from apple/QuietMisdreavus/clang-walk

* don't skip walking VarDecls from parent clang nodes

rdar://80235766

Author: QuietMisdreavus

lib/AST/ASTWalker.cpp

@@ -1241,7 +1241,7 @@ class Traversal : public ASTVisitor<Traversal, Expr*, Stmt*,
   }
 
   bool shouldSkip(Decl *D) {
-    if (isa<VarDecl>(D)) {
+    if (auto *VD = dyn_cast<VarDecl>(D)) {
       // VarDecls are walked via their NamedPattern, ignore them if we encounter
       // then in the few cases where they are also pushed outside as members.
       // In all those cases we can walk them via the pattern binding decl.
@@ -1250,8 +1250,8 @@ class Traversal : public ASTVisitor<Traversal, Expr*, Stmt*,
       if (Walker.Parent.getAsModule() &&
           D->getDeclContext()->getParentSourceFile())
         return true;
-      if (Decl *ParentD = Walker.Parent.getAsDecl())
-        return (isa<NominalTypeDecl>(ParentD) || isa<ExtensionDecl>(ParentD));
+      if (Walker.Parent.getAsDecl() && VD->getParentPatternBinding())
+        return true;
       auto walkerParentAsStmt = Walker.Parent.getAsStmt();
       if (walkerParentAsStmt && isa<BraceStmt>(walkerParentAsStmt))
         return true;

test/SymbolGraph/ClangImporter/Inputs/ObjcProperty/ObjcProperty.framework/Headers/ObjcProperty.h

@@ -0,0 +1,12 @@
+@import Foundation;
+
+@class Foo;
+
+@interface Foo : NSObject
+
+@property (nullable, strong, nonatomic) NSDate *today;
+
+- (void)selectDate:(nullable NSDate *)date;
+
+@end
+

test/SymbolGraph/ClangImporter/Inputs/ObjcProperty/ObjcProperty.framework/Modules/ObjcProperty.swiftmodule/.keep

@@ -0,0 +1,4 @@
+framework module ObjcProperty {
+  header "ObjcProperty.h"
+  export *
+}

test/SymbolGraph/ClangImporter/Inputs/ObjcProperty/ObjcProperty.framework/ObjcProperty

@@ -0,0 +1,13 @@
+// RUN: %empty-directory(%t)
+// RUN: cp -r %S/Inputs/ObjcProperty/ObjcProperty.framework %t
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-objc-interop -emit-module -o %t/ObjcProperty.framework/Modules/ObjcProperty.swiftmodule/%target-swiftmodule-name -import-underlying-module -F %t -module-name ObjcProperty -disable-objc-attr-requires-foundation-module %s
+// RUN: %target-swift-symbolgraph-extract -sdk %clang-importer-sdk -module-name ObjcProperty -F %t -output-dir %t -pretty-print -v
+// RUN: %FileCheck %s --input-file %t/ObjcProperty.symbols.json
+
+// REQUIRES: objc_interop
+
+import Foundation
+
+public enum SwiftEnum {}
+
+// CHECK: "precise": "c:objc(cs)Foo(py)today"