ModuleObjcMessageTrace: specify whether the owning context is an interface or category

Author: nkcsgexi

lib/FrontendTool/LoadedModuleTrace.cpp

@@ -838,6 +838,14 @@ class ObjcMethodReferenceCollector: public SourceEntityWalker {
     else
       return "method";
   }
+  static StringRef selectMethodOwnerKey(const clang::NamedDecl* clangD) {
+    assert(clangD);
+    if (isa<clang::ObjCInterfaceDecl>(clangD))
+      return "interface_type";
+    if (isa<clang::ObjCCategoryDecl>(clangD))
+      return "category_type";
+    return "type";
+  }
 public:
   void setFileBeforeVisiting(SourceFile *SF) {
     assert(SF && "need to visit actual source files");
@@ -857,7 +865,7 @@ class ObjcMethodReferenceCollector: public SourceEntityWalker {
                                                               ->getParent())) {
             auto pName = parent->getName();
             if (!pName.empty())
-              out.attribute("type", pName);
+              out.attribute(selectMethodOwnerKey(parent), pName);
           }
           out.attribute(selectMethodKey(clangD),  clangD->getNameAsString());
           out.attribute("declared_at", Loc.printToString(SM));

test/IDE/objc_send_collector.swift

@@ -16,6 +16,6 @@ public func testProperties(_ x: FooClassBase) {
 // CHECK-DAG: "instance_method": "fooBaseInstanceFunc0"
 // CHECK-DAG: "instance_method": "fooBaseInstanceFunc1:"
 // CHECK-DAG: "class_method": "fooBaseClassFunc0"
-// CHECK-DAG: "type": "FooClassBase"
+// CHECK-DAG: "interface_type": "FooClassBase"
 // CHECK-DAG: "declared_at": "SOURCE_DIR/test/IDE/Inputs/mock-sdk/Foo.framework/Headers/Foo.h
 // CHECK-DAG: "referenced_at": "SOURCE_DIR/test/IDE/objc_send_collector.swift"