Emit compiler version to the ObjC message trace file

Author: ahatanaka

clang/include/clang/AST/ObjCMethodReferenceInfo.h

@@ -24,6 +24,7 @@ class ObjCMethodDecl;
 
 struct ObjCMethodReferenceInfo {
   static constexpr unsigned FormatVersion = 1;
+  std::string ToolName, ToolVersion;
   std::string Target, TargetVariant;
 
   /// Paths to the files in which ObjC methods are referenced.

clang/lib/AST/ASTContext.cpp

@@ -67,6 +67,7 @@
 #include "clang/Basic/Specifiers.h"
 #include "clang/Basic/TargetCXXABI.h"
 #include "clang/Basic/TargetInfo.h"
+#include "clang/Basic/Version.h"
 #include "clang/Basic/XRayLists.h"
 #include "llvm/ADT/APFixedPoint.h"
 #include "llvm/ADT/APInt.h"
@@ -9296,6 +9297,7 @@ void clang::serializeObjCMethodReferencesAsJson(
     const clang::ObjCMethodReferenceInfo &Info, llvm::raw_ostream &OS) {
   llvm::json::OStream Out(OS, /*IndentSize=*/4);
   Out.object([&] {
+    Out.attribute(Info.ToolName, Info.ToolVersion);
     Out.attribute("format-version", Info.FormatVersion);
     Out.attribute("target", Info.Target);
     if (!Info.TargetVariant.empty())
@@ -9361,6 +9363,8 @@ void ASTContext::writeObjCMsgSendUsages(const std::string &Filename) {
         SourceMgr.getFileEntryRefForID(SourceMgr.getMainFileID());
     SmallString<256> MainFile(FE->getName());
     SourceMgr.getFileManager().makeAbsolutePath(MainFile);
+    Info.ToolName = "clang-compiler-version";
+    Info.ToolVersion = getClangFullVersion();
     Info.Target = getTargetInfo().getTriple().str();
     if (auto *VariantTriple = getTargetInfo().getDarwinTargetVariantTriple())
       Info.TargetVariant = VariantTriple->str();

clang/test/AST/objc-method-tracing.mm

@@ -1,7 +1,64 @@
 // RUN: env CLANG_COMPILER_OBJC_MESSAGE_TRACE_PATH=%t.txt %clang_cc1 -fsyntax-only -triple arm64-apple-macosx15.0.0 -I %S/Inputs %s
 // RUN: cat %t.txt | FileCheck %s
 
+#include "objc-method-tracing.h"
+
+@interface B(Cat1)
+-(void)m2;
+@end
+
+@interface B()
+-(void)m6;
+@end
+
+@implementation B
+-(void)m7:(int)i arg1:(float)f {
+}
+@end
+
+@implementation B(Cat1)
+-(void)m8 {
+}
+@end
+
+void test0(A *a) {
+  [a m0];
+}
+
+void test1(B *b) {
+  [b m0];
+}
+
+void test2(B *b) {
+  [B m1];
+}
+
+void test3(B *b) {
+  [b m2];
+}
+
+void test4(C *c) {
+  [c m4];
+}
+
+void test5(id<P0> p0) {
+  [p0 m5];
+}
+
+void test6(B *b) {
+  [b m6];
+}
+
+void test7(B *b) {
+  [b m7:123 arg1:4.5f];
+}
+
+void test8(B *b) {
+  [b m8];
+}
+
 // CHECK: {
+// CHECK-NEXT:    "clang-compiler-version": "clang version
 // CHECK-NEXT:    "format-version": 1,
 // CHECK-NEXT:    "target": "arm64-apple-macosx15.0.0",
 // CHECK-NEXT:    "references": [
@@ -27,7 +84,7 @@
 // CHECK-NEXT:            "interface_type": "B",
 // CHECK-NEXT:            "category_type": "Cat1",
 // CHECK-NEXT:            "instance_method": "-[B(Cat1) m2]",
-// CHECK-NEXT:            "declared_at": "[[SOURCE_FILE:.*]]:12:1",
+// CHECK-NEXT:            "declared_at": "[[SOURCE_FILE:.*]]:7:1",
 // CHECK-NEXT:            "referenced_at_file_id": 1
 // CHECK-NEXT:        },
 // CHECK-NEXT:        {
@@ -46,20 +103,20 @@
 // CHECK-NEXT:            "interface_type": "B",
 // CHECK-NEXT:            "category_type": "",
 // CHECK-NEXT:            "instance_method": "-[B() m6]",
-// CHECK-NEXT:            "declared_at": "[[SOURCE_FILE]]:16:1",
+// CHECK-NEXT:            "declared_at": "[[SOURCE_FILE]]:11:1",
 // CHECK-NEXT:            "referenced_at_file_id": 1
 // CHECK-NEXT:        },
 // CHECK-NEXT:        {
 // CHECK-NEXT:            "implementation_type": "B",
 // CHECK-NEXT:            "instance_method": "-[B m7:arg1:]",
-// CHECK-NEXT:            "declared_at": "[[SOURCE_FILE]]:20:1",
+// CHECK-NEXT:            "declared_at": "[[SOURCE_FILE]]:15:1",
 // CHECK-NEXT:            "referenced_at_file_id": 1
 // CHECK-NEXT:        },
 // CHECK-NEXT:        {
 // CHECK-NEXT:            "interface_type": "B",
 // CHECK-NEXT:            "category_implementation_type": "Cat1",
 // CHECK-NEXT:            "instance_method": "-[B(Cat1) m8]",
-// CHECK-NEXT:            "declared_at": "[[SOURCE_FILE]]:25:1",
+// CHECK-NEXT:            "declared_at": "[[SOURCE_FILE]]:20:1",
 // CHECK-NEXT:            "referenced_at_file_id": 1
 // CHECK-NEXT:        }
 // CHECK-NEXT:    ],
@@ -70,59 +127,3 @@
 // CHECK-NEXT:        }
 // CHECK-NEXT:    ]
 // CHECK-NEXT: }
-
-#include "objc-method-tracing.h"
-
-@interface B(Cat1)
--(void)m2;
-@end
-
-@interface B()
--(void)m6;
-@end
-
-@implementation B
--(void)m7:(int)i arg1:(float)f {
-}
-@end
-
-@implementation B(Cat1)
--(void)m8 {
-}
-@end
-
-void test0(A *a) {
-  [a m0];
-}
-
-void test1(B *b) {
-  [b m0];
-}
-
-void test2(B *b) {
-  [B m1];
-}
-
-void test3(B *b) {
-  [b m2];
-}
-
-void test4(C *c) {
-  [c m4];
-}
-
-void test5(id<P0> p0) {
-  [p0 m5];
-}
-
-void test6(B *b) {
-  [b m6];
-}
-
-void test7(B *b) {
-  [b m7:123 arg1:4.5f];
-}
-
-void test8(B *b) {
-  [b m8];
-}