Merge pull request #1233 from RustPython/revert-1225-coolreader18/nested-boolops

coolreader18 · web-flow · commit 28eb4969034d · 2019-08-11T12:29:29.000-05:00
Revert "Fix compilation of nested boolean operations"
diff --git a/compiler/src/compile.rs b/compiler/src/compile.rs
@@ -1303,9 +1303,11 @@ impl<O: OutputStream> Compiler<O> {
                             self.emit(Instruction::Pop);
                         }
                         if let Some(false_label) = false_label {
+                            self.emit(Instruction::Duplicate);
                             self.emit(Instruction::JumpIfFalse {
                                 target: false_label,
                             });
+                            self.emit(Instruction::Pop);
                         }
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -1303,9 +1303,11 @@ impl<O: OutputStream> Compiler<O> {`
`1303`	`1303`	`self.emit(Instruction::Pop);`
`1304`	`1304`	`}`
`1305`	`1305`	`if let Some(false_label) = false_label {`
	`1306`	`+ self.emit(Instruction::Duplicate);`
`1306`	`1307`	`self.emit(Instruction::JumpIfFalse {`
`1307`	`1308`	`target: false_label,`
`1308`	`1309`	`});`
	`1310`	`+ self.emit(Instruction::Pop);`
`1309`	`1311`	`}`
`1310`	`1312`	`}`
`1311`	`1313`	`}`