Skip to content

Fix best_base to select proper base class #5324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youknowone merged 7 commits into from
May 19, 2024
Merged

Fix best_base to select proper base class #5324

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ac10798
add __basicsize__ getter
Snowapril May 12, 2024
792ba47
modify best_base function to get proper base
Snowapril May 12, 2024
a6accc1
modify best_base to select proper base
Snowapril May 15, 2024
ffa8950
remove expected failures
Snowapril May 19, 2024
c1fe1f9
fix clippy warning
Snowapril May 18, 2024
abf8b13
inherit basicsize from the base type
Snowapril May 18, 2024
d679165
run cargo fmt
Snowapril May 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
run cargo fmt
  • Loading branch information
@Snowapril
Snowapril committed May 19, 2024
commit d679165cd7cab7558196c54cea55ee1c7f555de9
8 changes: 3 additions & 5 deletions vm/src/builtins/type.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1324,7 +1324,6 @@ fn calculate_meta_class(
Ok(winner)
}


fn solid_base(typ: &PyTypeRef, vm: &VirtualMachine) -> PyTypeRef {
let base = if let Some(base) = &typ.base {
solid_base(base, vm)
Expand All @@ -1341,7 +1340,6 @@ fn solid_base(typ: &PyTypeRef, vm: &VirtualMachine) -> PyTypeRef {
}

fn best_base(bases: &[PyTypeRef], vm: &VirtualMachine) -> PyResult<PyTypeRef> {

let mut base: Option<PyTypeRef> = None;
let mut winner: Option<PyTypeRef> = None;

Expand All @@ -1368,9 +1366,9 @@ fn best_base(bases: &[PyTypeRef], vm: &VirtualMachine) -> PyResult<PyTypeRef> {
winner = Some(candidate.clone());
base = Some(base_i.clone());
} else {
return Err(vm.new_type_error(
"multiple bases have instance layout conflict".to_string(),
));
return Err(
vm.new_type_error("multiple bases have instance layout conflict".to_string())
);
}
}

Expand Down