Merge pull request RustPython#1884 from RustPython/coolreader18/disable-unpack-opt

youknowone · web-flow · commit e147d3e69528 · 2020-04-26T00:11:21.000+09:00
Disable the unpack optimization
diff --git a/compiler/src/peephole.rs b/compiler/src/peephole.rs
@@ -92,7 +92,7 @@ impl<O: OutputStream> PeepholeOptimizer<O> {
     }
 
     fn optimize(&mut self) {
-        apply_optimizations!(self, operator, unpack);
+        apply_optimizations!(self, operator /* , unpack */);
     }
 }
 
diff --git a/compiler/src/peephole/optimizations.rs b/compiler/src/peephole/optimizations.rs
@@ -73,26 +73,27 @@ pub fn operator(buf: &mut impl OptimizationBuffer) {
     }
 }
 
-pub fn unpack(buf: &mut impl OptimizationBuffer) {
-    let (instruction, meta) = buf.pop();
-    if let Instruction::UnpackSequence { size } = instruction {
-        let (arg, arg_meta) = buf.pop();
-        match arg {
-            Instruction::BuildTuple {
-                size: tup_size,
-                unpack,
-            } if !unpack && tup_size == size => {
-                buf.emit(
-                    Instruction::Reverse { amount: size },
-                    vec![arg_meta, meta].into(),
-                );
-            }
-            arg => {
-                buf.emit(arg, arg_meta);
-                buf.emit(instruction, meta);
-            }
-        }
-    } else {
-        buf.emit(instruction, meta)
-    }
-}
+// TODO: make a version of this that doesn't miscompile `a, b = (1, 2) if True else (3, 4)`
+// pub fn unpack(buf: &mut impl OptimizationBuffer) {
+//     let (instruction, meta) = buf.pop();
+//     if let Instruction::UnpackSequence { size } = instruction {
+//         let (arg, arg_meta) = buf.pop();
+//         match arg {
+//             Instruction::BuildTuple {
+//                 size: tup_size,
+//                 unpack,
+//             } if !unpack && tup_size == size => {
+//                 buf.emit(
+//                     Instruction::Reverse { amount: size },
+//                     vec![arg_meta, meta].into(),
+//                 );
+//             }
+//             arg => {
+//                 buf.emit(arg, arg_meta);
+//                 buf.emit(instruction, meta);
+//             }
+//         }
+//     } else {
+//         buf.emit(instruction, meta)
+//     }
+// }
diff --git a/tests/snippets/if_expressions.py b/tests/snippets/if_expressions.py
@@ -24,3 +24,7 @@ def func2():
     return 20
 
 assert ret(func1() or func2()) == 20
+
+a, b = (1, 2) if True else (3, 4)
+assert a == 1
+assert b == 2

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ impl<O: OutputStream> PeepholeOptimizer<O> {`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`fn optimize(&mut self) {`
`95`		`- apply_optimizations!(self, operator, unpack);`
	`95`	`+ apply_optimizations!(self, operator /* , unpack */);`
`96`	`96`	`}`
`97`	`97`	`}`
`98`	`98`