Merge pull request #77337 from swiftlang/multi-file-objc-message

ModuleObjcMessageTrace: report ObjC method calls from all source files under compilation

Author: nkcsgexi

lib/FrontendTool/LoadedModuleTrace.cpp

@@ -23,6 +23,7 @@
 #include "swift/Basic/JSONSerialization.h"
 #include "swift/Basic/SourceManager.h"
 #include "swift/Frontend/FrontendOptions.h"
+#include "swift/Frontend/ModuleInterfaceSupport.h"
 #include "swift/IDE/SourceEntityWalker.h"
 
 #include "clang/AST/DeclObjC.h"
@@ -819,18 +820,19 @@ bool swift::emitLoadedModuleTraceIfNeeded(ModuleDecl *mainModule,
 const static unsigned OBJC_METHOD_TRACE_FILE_FORMAT_VERSION = 1;
 
 class ObjcMethodReferenceCollector: public SourceEntityWalker {
+  std::string compilerVer;
   std::string target;
   std::string targetVariant;
   SmallVector<StringRef, 32> FilePaths;
   unsigned CurrentFileID;
-  llvm::DenseSet<const clang::ObjCMethodDecl*> results;
+  llvm::DenseMap<const clang::ObjCMethodDecl*, unsigned> results;
   bool visitDeclReference(ValueDecl *D, CharSourceRange Range,
                           TypeDecl *CtorTyRef, ExtensionDecl *ExtTyRef,
                           Type T, ReferenceMetaData Data) override {
     if (!Range.isValid())
       return true;
     if (auto *clangD = dyn_cast_or_null<clang::ObjCMethodDecl>(D->getClangDecl())) {
-      results.insert(clangD);
+      results[clangD] = CurrentFileID;
     }
     return true;
   }
@@ -855,6 +857,8 @@ class ObjcMethodReferenceCollector: public SourceEntityWalker {
   }
 public:
   ObjcMethodReferenceCollector(ModuleDecl *MD) {
+    compilerVer =
+      getSwiftInterfaceCompilerVersionForCurrentCompiler(MD->getASTContext());
     auto &Opts = MD->getASTContext().LangOpts;
     target = Opts.Target.str();
     targetVariant = Opts.TargetVariant.has_value() ?
@@ -868,27 +872,29 @@ class ObjcMethodReferenceCollector: public SourceEntityWalker {
   void serializeAsJson(llvm::raw_ostream &OS) {
     llvm::json::OStream out(OS, /*IndentSize=*/4);
     out.object([&] {
+      out.attribute("swift-compiler-version", compilerVer);
       out.attribute("format-vesion", OBJC_METHOD_TRACE_FILE_FORMAT_VERSION);
       out.attribute("target", target);
       if (!targetVariant.empty())
         out.attribute("target-variant", targetVariant);
       out.attributeArray("references", [&] {
-        for (const clang::ObjCMethodDecl* clangD: results) {
+        for (auto pair: results) {
+          auto *clangD = pair.first;
           auto &SM = clangD->getASTContext().getSourceManager();
           clang::SourceLocation Loc = clangD->getLocation();
           if (!Loc.isValid()) {
             continue;
           }
           out.object([&] {
             if (auto *parent = dyn_cast_or_null<clang::NamedDecl>(clangD
-                                                                  ->getParent())) {
+                                                               ->getParent())) {
               auto pName = parent->getName();
               if (!pName.empty())
                 out.attribute(selectMethodOwnerKey(parent), pName);
             }
             out.attribute(selectMethodKey(clangD),  clangD->getNameAsString());
             out.attribute("declared_at", Loc.printToString(SM));
-            out.attribute("referenced_at_file_id", CurrentFileID);
+            out.attribute("referenced_at_file_id", pair.second);
           });
         }
       });

test/IDE/Inputs/objc_send_collector_2.swift

@@ -0,0 +1,5 @@
+import Foo
+
+public func testProperties2(_ x: FooClassBase, _ y: FooProtocolBase) {
+  y.fooProtoFunc()
+}

test/IDE/objc_send_collector.swift renamed to test/IDE/objc_send_collector_1.swift

@@ -1,6 +1,6 @@
 // RUN: %empty-directory(%t)
 
-// RUN: %target-swift-frontend  -I %t/lib/swift -typecheck %s -module-name main -swift-version 5 -F %S/Inputs/mock-sdk -emit-loaded-module-trace-path %t/.MODULE_TRACE
+// RUN: %target-swift-frontend  -I %t/lib/swift -typecheck %s %S/Inputs/objc_send_collector_2.swift -module-name main -swift-version 5 -F %S/Inputs/mock-sdk -emit-loaded-module-trace-path %t/.MODULE_TRACE
 // RUN: cat %t/.SWIFT_FINE_DEPENDENCY_TRACE/* | %FileCheck %s
 
 // REQUIRES: objc_interop
@@ -21,5 +21,8 @@ public func testProperties(_ x: FooClassBase, _ y: FooProtocolBase) {
 // CHECK-DAG: "protocol_type": "FooProtocolBase"
 // CHECK-DAG: "declared_at": "SOURCE_DIR/test/IDE/Inputs/mock-sdk/Foo.framework/Headers/Foo.h
 // CHECK-DAG: "referenced_at_file_id": 1
+// CHECK-DAG: "referenced_at_file_id": 2
 // CHECK-DAG: "file_id": 1,
-// CHECK-DAG: "file_path": "SOURCE_DIR/test/IDE/objc_send_collector.swift"
+// CHECK-DAG: "file_path": "SOURCE_DIR/test/IDE/objc_send_collector_1.swift"
+// CHECK-DAG: "file_path": "SOURCE_DIR/test/IDE/Inputs/objc_send_collector_2.swift"
+// CHECK-DAG: "swift-compiler-version":