Redefine __FILE__ to use only the basename of the file (#121)

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -275,9 +275,6 @@ 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");
-  }
   for (auto *child : decl->decls()) {
     if (IsConvertibleDecl(child) &&
         (IsInMainFile(child) || !decl_ids_.contains(GetID(child)))) {

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"
 
@@ -23,8 +25,9 @@ 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",
+      std::make_unique<FrontendAction>(rs_code, model, /*first=*/true,
+                                       rules_dir),
+      cc_code, tool_args, std::filesystem::path(filename).filename().string(),
       filename.ends_with(".c") ? CLANG_C_COMPILER : CLANG_CXX_COMPILER);
   return rs_code;
 }
@@ -49,6 +52,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/lit/lit/formats/Cpp2RustTest.py

@@ -184,7 +184,15 @@ def build_cpp(self):
             else os.environ.get("CXX", "clang++")
         )
         self.cpp_bin = self.tmp_dir / "cpp"
-        cmd = [cc, "-O3", "-o", str(self.cpp_bin), str(self.cc_input)]
+        cmd = [
+            cc,
+            "-O3",
+            "-o",
+            str(self.cpp_bin),
+            str(self.cc_input),
+            "-Wno-builtin-macro-redefined",
+            '-D__FILE__="' + os.path.basename(self.cc_input) + '"',
+        ]
         _, _, rc = lit.util.executeCommand(cmd)
         if rc != 0:
             return (exp.fail_code, cc + " failed")

tests/multi-file/extern_functions/out/refcount/extern_functions.rs

@@ -6,8 +6,6 @@ use std::io::prelude::*;
 use std::io::{Read, Seek, Write};
 use std::os::fd::AsFd;
 use std::rc::{Rc, Weak};
-
-// a.rs
 pub fn main() {
     std::process::exit(main_0());
 }
@@ -21,7 +19,6 @@ fn main_0() -> i32 {
     );
     return 0;
 }
-// b.rs
 pub fn unrelated1_1() -> i32 {
     return 1;
 }

tests/multi-file/extern_functions/out/unsafe/extern_functions.rs

@@ -6,8 +6,6 @@ use std::collections::BTreeMap;
 use std::io::{Read, Seek, Write};
 use std::os::fd::{AsFd, FromRawFd, IntoRawFd};
 use std::rc::Rc;
-
-// a.rs
 pub fn main() {
     unsafe {
         std::process::exit(main_0() as i32);
@@ -23,7 +21,6 @@ unsafe fn main_0() -> i32 {
     );
     return 0;
 }
-// b.rs
 pub unsafe fn unrelated1_1() -> i32 {
     return 1;
 }

tests/multi-file/header_function/out/refcount/header_function.rs

@@ -6,8 +6,6 @@ use std::io::prelude::*;
 use std::io::{Read, Seek, Write};
 use std::os::fd::AsFd;
 use std::rc::{Rc, Weak};
-
-// a.rs
 pub fn main() {
     std::process::exit(main_0());
 }
@@ -21,7 +19,6 @@ fn main_0() -> i32 {
     );
     return 0;
 }
-// b.rs
 pub fn unrelated1_1() -> i32 {
     return 1;
 }

tests/multi-file/header_function/out/unsafe/header_function.rs

@@ -6,8 +6,6 @@ use std::collections::BTreeMap;
 use std::io::{Read, Seek, Write};
 use std::os::fd::{AsFd, FromRawFd, IntoRawFd};
 use std::rc::Rc;
-
-// a.rs
 pub fn main() {
     unsafe {
         std::process::exit(main_0() as i32);
@@ -23,7 +21,6 @@ unsafe fn main_0() -> i32 {
     );
     return 0;
 }
-// b.rs
 pub unsafe fn unrelated1_1() -> i32 {
     return 1;
 }

tests/unit/macros.cpp

@@ -0,0 +1,11 @@
+#include <stdio.h>
+
+void log(const char *file, int line, const char *func) {
+  printf("%s %d %s\n", file, line, func);
+}
+
+int main() {
+  printf("%s %d %s\n", __FILE__, __LINE__, __FUNCTION__);
+  log(__FILE__, __LINE__, __FUNCTION__);
+  return 0;
+}

tests/unit/out/refcount/macros.rs

@@ -0,0 +1,37 @@
+extern crate libcc2rs;
+use libcc2rs::*;
+use std::cell::RefCell;
+use std::collections::BTreeMap;
+use std::io::prelude::*;
+use std::io::{Read, Seek, Write};
+use std::os::fd::AsFd;
+use std::rc::{Rc, Weak};
+pub fn log_0(file: Ptr<u8>, line: i32, func: Ptr<u8>) {
+    let file: Value<Ptr<u8>> = Rc::new(RefCell::new(file));
+    let line: Value<i32> = Rc::new(RefCell::new(line));
+    let func: Value<Ptr<u8>> = Rc::new(RefCell::new(func));
+    println!(
+        "{} {} {}",
+        (*file.borrow()),
+        (*line.borrow()),
+        (*func.borrow())
+    );
+}
+pub fn main() {
+    std::process::exit(main_0());
+}
+fn main_0() -> i32 {
+    println!(
+        "{} {} {}",
+        Ptr::from_string_literal("macros.cpp"),
+        8,
+        Ptr::from_string_literal("main")
+    );
+    ({
+        let _file: Ptr<u8> = Ptr::from_string_literal("macros.cpp");
+        let _line: i32 = 9;
+        let _func: Ptr<u8> = Ptr::from_string_literal("main");
+        log_0(_file, _line, _func)
+    });
+    return 0;
+}

tests/unit/out/unsafe/macros.rs

@@ -0,0 +1,31 @@
+extern crate libc;
+use libc::*;
+extern crate libcc2rs;
+use libcc2rs::*;
+use std::collections::BTreeMap;
+use std::io::{Read, Seek, Write};
+use std::os::fd::{AsFd, FromRawFd, IntoRawFd};
+use std::rc::Rc;
+pub unsafe fn log_0(mut file: *const u8, mut line: i32, mut func: *const u8) {
+    printf(b"%s %d %s\n\0".as_ptr() as *const i8, file, line, func);
+}
+pub fn main() {
+    unsafe {
+        std::process::exit(main_0() as i32);
+    }
+}
+unsafe fn main_0() -> i32 {
+    printf(
+        b"%s %d %s\n\0".as_ptr() as *const i8,
+        b"macros.cpp\0".as_ptr(),
+        8,
+        b"main\0".as_ptr(),
+    );
+    (unsafe {
+        let _file: *const u8 = b"macros.cpp\0".as_ptr();
+        let _line: i32 = 9;
+        let _func: *const u8 = b"main\0".as_ptr();
+        log_0(_file, _line, _func)
+    });
+    return 0;
+}