address copilot

Author: grypp

mlir/include/mlir/IR/Remarks.h

@@ -82,7 +82,6 @@ class RemarkBase : public llvm::DiagnosticInfo {
 
   virtual bool isEnabled() const = 0;
   Location getLocation() const { return loc; }
-  llvm::remarks::RemarkLocation getRemarkLocation() const;
   /// Diagnostic -> Remark
   llvm::remarks::Remark generateRemark() const;
 

mlir/lib/IR/Remarks.cpp

@@ -103,21 +103,19 @@ llvm::remarks::Type RemarkBase::getRemarkType() const {
   llvm_unreachable("Unknown remark kind");
 }
 
-llvm::remarks::RemarkLocation RemarkBase::getRemarkLocation() const {
-  if (auto flc = dyn_cast<FileLineColLoc>(getLocation())) {
-    auto *buf = new std::string("./" + flc.getFilename().str());
-    return {*buf, flc.getLine(), flc.getColumn()};
-  }
-  return {"<unknown file>", 0, 0};
-}
-
 llvm::remarks::Remark RemarkBase::generateRemark() const {
+  auto locLambda = [&]() -> llvm::remarks::RemarkLocation {
+    if (auto flc = dyn_cast<FileLineColLoc>(getLocation()))
+      return {flc.getFilename(), flc.getLine(), flc.getColumn()};
+    return {"<unknown file>", 0, 0};
+  };
+
   llvm::remarks::Remark r; // The result.
   r.RemarkType = getRemarkType();
   r.PassName = getPassName();
   r.RemarkName = getRemarkName();
   r.FunctionName = getFunction();
-  r.Loc = getRemarkLocation();
+  r.Loc = locLambda();
   for (const RemarkBase::RemarkKeyValue &arg : getArgs()) {
     r.Args.emplace_back();
     r.Args.back().Key = arg.key;

mlir/unittests/IR/RemarkTest.cpp

@@ -33,8 +33,12 @@ TEST(Remark, TestOutputOptimizationRemark) {
   std::string myPassname1("myPass1");
   std::string myPassname2("myPass2");
   std::string funcName("myFunc");
-  std::string yamlFile = "/tmp/remarks.yaml";
-
+  SmallString<64> tmpPathStorage;
+  sys::fs::createUniquePath("remarks-%%%%%%.yaml", tmpPathStorage,
+                            /*MakeAbsolute=*/true);
+  std::string yamlFile =
+      std::string(tmpPathStorage.data(), tmpPathStorage.size());
+  ASSERT_FALSE(yamlFile.empty());
   Location loc = UnknownLoc::get(context);
 
   // Setup the remark engine
@@ -77,14 +81,17 @@ TEST(Remark, TestOutputOptimizationRemark) {
 
 TEST(Remark, TestNoOutputOptimizationRemark) {
   const auto *pass1Msg = "My message";
-
   auto *context = new MLIRContext();
 
   std::string categoryFailName("myImportantCategory");
   std::string myPassname1("myPass1");
   std::string funcName("myFunc");
-  std::string yamlFile = "/tmp/remarks.yaml";
-
+  SmallString<64> tmpPathStorage;
+  sys::fs::createUniquePath("remarks-%%%%%%.yaml", tmpPathStorage,
+                            /*MakeAbsolute=*/true);
+  std::string yamlFile =
+      std::string(tmpPathStorage.data(), tmpPathStorage.size());
+  ASSERT_FALSE(yamlFile.empty());
   std::error_code ec =
       llvm::sys::fs::remove(yamlFile, /*IgnoreNonExisting=*/true);
   if (ec) {