Redefine __FILE__ to use only the basename of the file

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -275,9 +275,7 @@ bool Converter::VisitUsingType(clang::UsingType *type) {
 bool Converter::Convert(clang::Decl *decl) { return TraverseDecl(decl); }
 
 bool Converter::VisitTranslationUnitDecl(clang::TranslationUnitDecl *decl) {
-  if (auto main_file_name = GetMainFileName(ctx_); main_file_name != "input") {
-    StrCat("\n//", main_file_name + ".rs\n");
-  }
+  StrCat("\n//", GetMainFileName(ctx_) + ".rs\n");
   for (auto *child : decl->decls()) {
     if (IsConvertibleDecl(child) &&
         (IsInMainFile(child) || !decl_ids_.contains(GetID(child)))) {
@@ -294,7 +292,7 @@ bool Converter::VisitFunctionDecl(clang::FunctionDecl *decl) {
   if (!IsConvertibleFunctionDecl(decl)) {
     return false;
   }
-  if (!IsInMainFile(decl) && !decl_ids_.insert(GetID(decl)).second) {
+  if (!decl_ids_.insert(GetID(decl)).second) {
     return false;
   }
   decl->dump(log());

cpp2rust/cpp2rust_lib.cpp

@@ -7,6 +7,8 @@
 #include <clang/Tooling/CompilationDatabase.h>
 #include <clang/Tooling/Tooling.h>
 
+#include <filesystem>
+
 #include "compat/platform_flags.h"
 #include "frontend_action.h"
 
@@ -24,7 +26,7 @@ std::string TranspileSrc(std::string_view cc_code, Model model,
   std::string rs_code;
   clang::tooling::runToolOnCodeWithArgs(
       std::make_unique<FrontendAction>(rs_code, model, true, rules_dir),
-      cc_code, tool_args, filename.ends_with(".c") ? "input.c" : "input.cpp",
+      cc_code, tool_args, filename,
       filename.ends_with(".c") ? CLANG_C_COMPILER : CLANG_CXX_COMPILER);
   return rs_code;
 }
@@ -49,6 +51,18 @@ std::string TranspileDir(std::string_view build_dir, Model model,
       clang::tooling::ArgumentInsertPosition::BEGIN));
   Tool.appendArgumentsAdjuster(clang::tooling::getInsertArgumentAdjuster(
       getPlatformClangEndFlags(), clang::tooling::ArgumentInsertPosition::END));
+  // Redefine __FILE__ to use just the basename, so the generated code
+  // doesn't contain system-specific absolute paths.
+  Tool.appendArgumentsAdjuster(
+      [](const clang::tooling::CommandLineArguments &args,
+         llvm::StringRef filename) {
+        auto result = args;
+        auto basename =
+            std::filesystem::path(filename.str()).filename().string();
+        result.push_back("-Wno-builtin-macro-redefined");
+        result.push_back("-D__FILE__=\"" + basename + "\"");
+        return result;
+      });
 
   std::string rs_code;
   FrontendActionFactory factory(rs_code, model, rules_dir);

tests/benchmarks/out/refcount/array_sum.rs

@@ -6,6 +6,8 @@ use std::io::prelude::*;
 use std::io::{Read, Seek, Write};
 use std::os::fd::AsFd;
 use std::rc::{Rc, Weak};
+
+// array_sum.rs
 pub fn main() {
     std::process::exit(main_0());
 }

tests/benchmarks/out/refcount/bfs.rs

@@ -6,6 +6,8 @@ use std::io::prelude::*;
 use std::io::{Read, Seek, Write};
 use std::os::fd::AsFd;
 use std::rc::{Rc, Weak};
+
+// bfs.rs
 #[derive(Default)]
 pub struct Queue {
     pub elems: Value<Ptr<u32>>,

tests/benchmarks/out/refcount/bst.rs

@@ -6,6 +6,8 @@ use std::io::prelude::*;
 use std::io::{Read, Seek, Write};
 use std::os::fd::AsFd;
 use std::rc::{Rc, Weak};
+
+// bst.rs
 #[derive(Default)]
 pub struct node_t {
     pub left: Value<Ptr<node_t>>,

tests/benchmarks/out/refcount/fibonacci.rs

@@ -6,6 +6,8 @@ use std::io::prelude::*;
 use std::io::{Read, Seek, Write};
 use std::os::fd::AsFd;
 use std::rc::{Rc, Weak};
+
+// fibonacci.rs
 pub fn fib_0(n: u64) -> u64 {
     let n: Value<u64> = Rc::new(RefCell::new(n));
     return if ((*n.borrow()) == 0_u64) || ((*n.borrow()) == 1_u64) {

tests/benchmarks/out/refcount/prime.rs

@@ -6,6 +6,8 @@ use std::io::prelude::*;
 use std::io::{Read, Seek, Write};
 use std::os::fd::AsFd;
 use std::rc::{Rc, Weak};
+
+// prime.rs
 pub fn is_prime_0(x: i32) -> bool {
     let x: Value<i32> = Rc::new(RefCell::new(x));
     let i: Value<i32> = Rc::new(RefCell::new(2));

tests/benchmarks/out/refcount/ptr_fibonacci.rs

@@ -6,6 +6,8 @@ use std::io::prelude::*;
 use std::io::{Read, Seek, Write};
 use std::os::fd::AsFd;
 use std::rc::{Rc, Weak};
+
+// ptr_fibonacci.rs
 pub fn fib_0(n: Ptr<u64>) {
     let n: Value<Ptr<u64>> = Rc::new(RefCell::new(n));
     if (((*n.borrow()).read()) == 0_u64) || (((*n.borrow()).read()) == 1_u64) {

tests/benchmarks/out/refcount/ref_array_sum.rs

@@ -6,6 +6,8 @@ use std::io::prelude::*;
 use std::io::{Read, Seek, Write};
 use std::os::fd::AsFd;
 use std::rc::{Rc, Weak};
+
+// ref_array_sum.rs
 pub fn initialize_0(array: Ptr<Option<Value<Box<[i32]>>>>, N: i32) {
     let N: Value<i32> = Rc::new(RefCell::new(N));
     let i: Value<i32> = Rc::new(RefCell::new(0));

tests/benchmarks/out/refcount/ref_fibonacci.rs

@@ -6,6 +6,8 @@ use std::io::prelude::*;
 use std::io::{Read, Seek, Write};
 use std::os::fd::AsFd;
 use std::rc::{Rc, Weak};
+
+// ref_fibonacci.rs
 pub fn fib_0(n: Ptr<u64>) {
     if ((n.read()) == 0_u64) || ((n.read()) == 1_u64) {
         return;