luxolus
/
pyo3
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Fix the pydebug with trace refs and count_allocs for python > 3.7" 

This reverts commit c780aa931d.
This commit is contained in:
David Hewitt 2023-08-15 08:41:22 +01:00
parent 1a33f8792f
commit 43b37109de
2 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
newsfragments/3387.packaging.md Normal file
View File

@ -0,0 +1 @@
Drop support for debug builds of Python 3.7.

35
pyo3-build-config/src/impl_.rs
View File

@ -300,7 +300,7 @@ print("ext_suffix", get_config_var("EXT_SUFFIX"))
lib_dir, lib_dir,
executable: map.get("executable").cloned(), executable: map.get("executable").cloned(),
pointer_width: Some(calcsize_pointer * 8), pointer_width: Some(calcsize_pointer * 8),
build_flags: BuildFlags::from_interpreter(interpreter)?.fixup(version), build_flags: BuildFlags::from_interpreter(interpreter)?,
suppress_build_script_link_lines: false, suppress_build_script_link_lines: false,
extra_build_script_lines: vec![], extra_build_script_lines: vec![],
}) })
@ -349,7 +349,7 @@ print("ext_suffix", get_config_var("EXT_SUFFIX"))
let pointer_width = parse_key!(sysconfigdata, "SIZEOF_VOID_P") let pointer_width = parse_key!(sysconfigdata, "SIZEOF_VOID_P")
.map(|bytes_width: u32| bytes_width * 8) .map(|bytes_width: u32| bytes_width * 8)
.ok(); .ok();
let build_flags = BuildFlags::from_sysconfigdata(sysconfigdata).fixup(version); let build_flags = BuildFlags::from_sysconfigdata(sysconfigdata);
Ok(InterpreterConfig { Ok(InterpreterConfig {
implementation, implementation,
@ -1019,6 +1019,7 @@ impl BuildFlags {
}) })
.collect(), .collect(),
) )
.fixup()
} }
/// Examine python's compile flags to pass to cfg by launching /// Examine python's compile flags to pass to cfg by launching
@ -1053,16 +1054,12 @@ impl BuildFlags {
.map(|(flag, _)| flag.clone()) .map(|(flag, _)| flag.clone())
.collect(); .collect();
Ok(Self(flags)) Ok(Self(flags).fixup())
} }
fn fixup(mut self, version: PythonVersion) -> Self { fn fixup(mut self) -> Self {
if self.0.contains(&BuildFlag::Py_DEBUG) { if self.0.contains(&BuildFlag::Py_DEBUG) {
self.0.insert(BuildFlag::Py_REF_DEBUG); self.0.insert(BuildFlag::Py_REF_DEBUG);
if version <= PythonVersion::PY37 {
// Py_DEBUG only implies Py_TRACE_REFS until Python 3.7
self.0.insert(BuildFlag::Py_TRACE_REFS);
}
} }
self self
@ -1935,25 +1932,17 @@ mod tests {
} }
#[test] #[test]
fn build_flags_fixup_py37_debug() { fn build_flags_fixup() {
let mut build_flags = BuildFlags::new(); let mut build_flags = BuildFlags::new();
build_flags = build_flags.fixup();
assert!(build_flags.0.is_empty());
build_flags.0.insert(BuildFlag::Py_DEBUG); build_flags.0.insert(BuildFlag::Py_DEBUG);
build_flags = build_flags.fixup(PythonVersion { major: 3, minor: 7 }); build_flags = build_flags.fixup();
// On 3.7, Py_DEBUG implies Py_REF_DEBUG and Py_TRACE_REFS // Py_DEBUG implies Py_REF_DEBUG
assert!(build_flags.0.contains(&BuildFlag::Py_REF_DEBUG));
assert!(build_flags.0.contains(&BuildFlag::Py_TRACE_REFS));
}
#[test]
fn build_flags_fixup_py38_debug() {
let mut build_flags = BuildFlags::new();
build_flags.0.insert(BuildFlag::Py_DEBUG);
build_flags = build_flags.fixup(PythonVersion { major: 3, minor: 8 });
// On 3.8, Py_DEBUG implies Py_REF_DEBUG
assert!(build_flags.0.contains(&BuildFlag::Py_REF_DEBUG)); assert!(build_flags.0.contains(&BuildFlag::Py_REF_DEBUG));
} }