mirrors/RustPython-Parser
1
0
Fork 0
mirror of https://github.com/RustPython/Parser.git synced 2025-07-08 05:35:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add tuple unpacking optimization

Browse source
This commit is contained in:
coolreader18 2019-08-04 01:22:51 -05:00
parent 347d6c006a
commit 4cb8cc34e4
1 changed files with 38 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

58
src/peephole.rs
View file

@ -10,8 +10,8 @@ struct InstructionMetadata {
labels: Vec<Label>,
}
impl InstructionMetadata {
fn from_multiple(metas: Vec<Self>) -> Self {
impl From<Vec<InstructionMetadata>> for InstructionMetadata {
fn from(metas: Vec<Self>) -> Self {
debug_assert!(!metas.is_empty(), "`metas` must not be empty");
InstructionMetadata {
loc: metas[0].loc.clone(),
@ -69,28 +69,28 @@ impl<O: OutputStream> PeepholeOptimizer<O> {
}
fn optimize(&mut self, instruction: Instruction, meta: InstructionMetadata) {
macro_rules! lc {
($name:ident {$($field:tt)*}) => {
Instruction::LoadConst {
value: bytecode::Constant::$name {$($field)*},
}
};
($name:ident, $($value:tt)*) => {
lc!($name { value: $($value)* })
};
}
macro_rules! emitconst {
([$($metas:expr),*], $($arg:tt)*) => {
self.emit(
lc!($($arg)*),
InstructionMetadata::from(vec![$($metas),*]),
)
};
}
match instruction {
Instruction::BinaryOperation { op, inplace } => {
let (rhs, rhs_meta) = self.pop();
let (lhs, lhs_meta) = self.pop();
macro_rules! lc {
($name:ident {$($field:tt)*}) => {
Instruction::LoadConst {
value: bytecode::Constant::$name {$($field)*},
}
};
($name:ident, $($value:tt)*) => {
lc!($name { value: $($value)* })
};
}
macro_rules! emitconst {
([$($metas:expr),*], $($arg:tt)*) => {
self.emit(
lc!($($arg)*),
InstructionMetadata::from_multiple(vec![$($metas),*]),
)
};
}
macro_rules! op {
($op:ident) => {
bytecode::BinaryOperator::$op
@ -129,6 +129,24 @@ impl<O: OutputStream> PeepholeOptimizer<O> {
}
}
}
Instruction::UnpackSequence { size } => {
let (arg, arg_meta) = self.pop();
match arg {
Instruction::BuildTuple {
size: tup_size,
unpack,
} if !unpack && tup_size == size => {
self.emit(
Instruction::Reverse { amount: size },
vec![arg_meta, meta].into(),
);
}
arg => {
self.emit(arg, arg_meta);
self.emit(instruction, meta);
}
}
}
other => self.emit(other, meta),
}
}