mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make_direct_deprecated: dont overwrite already set attributes

Browse Source
This commit is contained in:
Ralf Jung 2023-11-19 16:03:07 +01:00
parent cfb47ca5df
commit c7b8dd4e93
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
compiler/rustc_target/src/abi/call/mod.rs
View File

@ -584,20 +584,26 @@ impl<'a, Ty> ArgAbi<'a, Ty> {
/// Only exists because of past ABI mistakes that will take time to fix /// Only exists because of past ABI mistakes that will take time to fix
/// (see <https://github.com/rust-lang/rust/issues/115666>). /// (see <https://github.com/rust-lang/rust/issues/115666>).
pub fn make_direct_deprecated(&mut self) { pub fn make_direct_deprecated(&mut self) {
match self.mode {
PassMode::Indirect { .. } => {
self.mode = PassMode::Direct(ArgAttributes::new()); self.mode = PassMode::Direct(ArgAttributes::new());
} }
PassMode::Ignore | PassMode::Direct(_) | PassMode::Pair(_, _) => return, // already direct
_ => panic!("Tried to make {:?} direct", self.mode),
}
}
pub fn make_indirect(&mut self) { pub fn make_indirect(&mut self) {
match self.mode { match self.mode {
PassMode::Direct(_) | PassMode::Pair(_, _) => {} PassMode::Direct(_) | PassMode::Pair(_, _) => {
self.mode = Self::indirect_pass_mode(&self.layout);
}
PassMode::Indirect { attrs: _, meta_attrs: _, on_stack: false } => { PassMode::Indirect { attrs: _, meta_attrs: _, on_stack: false } => {
// already indirect // already indirect
return; return;
} }
_ => panic!("Tried to make {:?} indirect", self.mode), _ => panic!("Tried to make {:?} indirect", self.mode),
} }
self.mode = Self::indirect_pass_mode(&self.layout);
} }
pub fn make_indirect_byval(&mut self, byval_align: Option<Align>) { pub fn make_indirect_byval(&mut self, byval_align: Option<Align>) {