diff --git a/Cargo.lock b/Cargo.lock index 28bc2732ac..a021355da5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -90,6 +90,7 @@ dependencies = [ "rustc-hash", "shlex", "syn", + "tempfile", ] [[package]] diff --git a/bindgen/Cargo.toml b/bindgen/Cargo.toml index 478574edb3..2cd1abfc01 100644 --- a/bindgen/Cargo.toml +++ b/bindgen/Cargo.toml @@ -41,6 +41,7 @@ regex = { workspace = true, features = ["std", "unicode-perl"] } rustc-hash.workspace = true shlex.workspace = true syn = { workspace = true, features = ["full", "extra-traits", "visit-mut"] } +tempfile.workspace = true [features] default = ["logging", "prettyplease", "runtime"] diff --git a/bindgen/clang.rs b/bindgen/clang.rs index 9e614da9f8..b947470e19 100644 --- a/bindgen/clang.rs +++ b/bindgen/clang.rs @@ -7,6 +7,9 @@ use crate::ir::context::BindgenContext; use clang_sys::*; use std::cmp; +use std::os::unix::ffi::OsStrExt; +use std::path::{Path, PathBuf}; +use tempfile::TempDir; use std::ffi::{CStr, CString}; use std::fmt; @@ -1822,12 +1825,12 @@ impl TranslationUnit { /// Parse a source file into a translation unit. pub(crate) fn parse( ix: &Index, - file: &str, + file: &Path, cmd_args: &[Box], unsaved: &[UnsavedFile], opts: CXTranslationUnit_Flags, ) -> Option { - let fname = CString::new(file).unwrap(); + let fname = path_to_cstring(file); let _c_args: Vec = cmd_args .iter() .map(|s| CString::new(s.as_bytes()).unwrap()) @@ -1879,10 +1882,8 @@ impl TranslationUnit { } /// Save a translation unit to the given file. - pub(crate) fn save(&mut self, file: &str) -> Result<(), CXSaveError> { - let Ok(file) = CString::new(file) else { - return Err(CXSaveError_Unknown); - }; + pub(crate) fn save(&mut self, file: &Path) -> Result<(), CXSaveError> { + let file = path_to_cstring(file); let ret = unsafe { clang_saveTranslationUnit( self.x, @@ -1913,8 +1914,9 @@ impl Drop for TranslationUnit { /// Translation unit used for macro fallback parsing pub(crate) struct FallbackTranslationUnit { - file_path: String, - pch_path: String, + temp_dir: TempDir, + file_path: PathBuf, + pch_path: PathBuf, idx: Box, tu: TranslationUnit, } @@ -1928,8 +1930,9 @@ impl fmt::Debug for FallbackTranslationUnit { impl FallbackTranslationUnit { /// Create a new fallback translation unit pub(crate) fn new( - file: String, - pch_path: String, + temp_dir: TempDir, + file: PathBuf, + pch_path: PathBuf, c_args: &[Box], ) -> Option { // Create empty file @@ -1949,6 +1952,7 @@ impl FallbackTranslationUnit { CXTranslationUnit_None, )?; Some(FallbackTranslationUnit { + temp_dir, file_path: file, pch_path, tu: f_translation_unit, @@ -1985,13 +1989,6 @@ impl FallbackTranslationUnit { } } -impl Drop for FallbackTranslationUnit { - fn drop(&mut self) { - let _ = std::fs::remove_file(&self.file_path); - let _ = std::fs::remove_file(&self.pch_path); - } -} - /// A diagnostic message generated while parsing a translation unit. pub(crate) struct Diagnostic { x: CXDiagnostic, @@ -2032,9 +2029,9 @@ pub(crate) struct UnsavedFile { } impl UnsavedFile { - /// Construct a new unsaved file with the given `name` and `contents`. - pub(crate) fn new(name: &str, contents: &str) -> UnsavedFile { - let name = CString::new(name.as_bytes()).unwrap(); + /// Construct a new unsaved file with the given `path` and `contents`. + pub(crate) fn new(path: &Path, contents: &str) -> UnsavedFile { + let name = path_to_cstring(path); let contents = CString::new(contents.as_bytes()).unwrap(); let x = CXUnsavedFile { Filename: name.as_ptr(), @@ -2447,3 +2444,7 @@ impl TargetInfo { } } } + +fn path_to_cstring(path: &Path) -> CString { + CString::new(path.as_os_str().as_bytes()).unwrap() +} diff --git a/bindgen/ir/context.rs b/bindgen/ir/context.rs index b5b6b4a000..6202062302 100644 --- a/bindgen/ir/context.rs +++ b/bindgen/ir/context.rs @@ -32,6 +32,7 @@ use std::cell::{Cell, RefCell}; use std::collections::{BTreeSet, HashMap as StdHashMap}; use std::mem; use std::path::Path; +use tempfile::TempDir; /// An identifier for some kind of IR item. #[derive(Debug, Copy, Clone, Eq, PartialOrd, Ord, Hash)] @@ -556,7 +557,7 @@ impl BindgenContext { clang::TranslationUnit::parse( &index, - "", + "".as_ref(), &options.clang_args, input_unsaved_files, parse_options, @@ -2045,13 +2046,9 @@ If you encounter an error missing from this list, please file an issue or a PR!" &mut self, ) -> Option<&mut clang::FallbackTranslationUnit> { if self.fallback_tu.is_none() { - let file = format!( - "{}/.macro_eval.c", - match self.options().clang_macro_fallback_build_dir { - Some(ref path) => path.as_os_str().to_str()?, - None => ".", - } - ); + let temp_dir = TempDir::new().unwrap(); + + let file = temp_dir.path().join(".macro_eval.c"); let index = clang::Index::new(false, false); @@ -2079,14 +2076,9 @@ If you encounter an error missing from this list, please file an issue or a PR!" header_names_to_compile .push(header_name.split(".h").next()?.to_string()); } - let pch = format!( - "{}/{}", - match self.options().clang_macro_fallback_build_dir { - Some(ref path) => path.as_os_str().to_str()?, - None => ".", - }, - header_names_to_compile.join("-") + "-precompile.h.pch" - ); + let pch = temp_dir + .path() + .join(header_names_to_compile.join("-") + "-precompile.h.pch"); let mut c_args = self.options.fallback_clang_args.clone(); c_args.push("-x".to_string().into_boxed_str()); @@ -2100,7 +2092,7 @@ If you encounter an error missing from this list, please file an issue or a PR!" } let mut tu = clang::TranslationUnit::parse( &index, - single_header, + (**single_header).as_ref(), &c_args, &[], clang_sys::CXTranslationUnit_ForSerialization, @@ -2109,7 +2101,7 @@ If you encounter an error missing from this list, please file an issue or a PR!" let mut c_args = vec![ "-include-pch".to_string().into_boxed_str(), - pch.clone().into_boxed_str(), + pch.to_string_lossy().into_owned().into_boxed_str(), ]; let mut skip_next = false; for arg in &self.options.fallback_clang_args { @@ -2121,8 +2113,9 @@ If you encounter an error missing from this list, please file an issue or a PR!" c_args.push(arg.clone()); } } - self.fallback_tu = - Some(clang::FallbackTranslationUnit::new(file, pch, &c_args)?); + self.fallback_tu = Some(clang::FallbackTranslationUnit::new( + temp_dir, file, pch, &c_args, + )?); } self.fallback_tu.as_mut() diff --git a/bindgen/lib.rs b/bindgen/lib.rs index 0305b5cd7b..e6ed1b4bc8 100644 --- a/bindgen/lib.rs +++ b/bindgen/lib.rs @@ -365,7 +365,7 @@ impl Builder { std::mem::take(&mut self.options.input_header_contents) .into_iter() .map(|(name, contents)| { - clang::UnsavedFile::new(name.as_ref(), contents.as_ref()) + clang::UnsavedFile::new((*name).as_ref(), contents.as_ref()) }) .collect::>(); diff --git a/bindgen/options/cli.rs b/bindgen/options/cli.rs index 5304862584..5d2ed2e2d1 100644 --- a/bindgen/options/cli.rs +++ b/bindgen/options/cli.rs @@ -499,9 +499,6 @@ struct BindgenCommand { /// Enable fallback for clang macro parsing. #[arg(long)] clang_macro_fallback: bool, - /// Set path for temporary files generated by fallback for clang macro parsing. - #[arg(long)] - clang_macro_fallback_build_dir: Option, /// Use DSTs to represent structures with flexible array members. #[arg(long)] flexarray_dst: bool, @@ -695,7 +692,6 @@ where override_abi, wrap_unsafe_ops, clang_macro_fallback, - clang_macro_fallback_build_dir, flexarray_dst, with_derive_custom, with_derive_custom_struct, @@ -1001,7 +997,6 @@ where override_abi => |b, (abi, regex)| b.override_abi(abi, regex), wrap_unsafe_ops, clang_macro_fallback => |b, _| b.clang_macro_fallback(), - clang_macro_fallback_build_dir, flexarray_dst, wrap_static_fns, wrap_static_fns_path,