Merge pull request #1122 from palaviv/fix-exception-stack

Fix exception stack

tests/snippets/try_exceptions.py

@@ -220,3 +220,21 @@ try:
     raise NameError
 except NameError as ex:
     assert ex.__context__ == None
+
+
+try:
+    {}[1]
+except KeyError:
+    try:
+        raise RuntimeError()
+    except RuntimeError:
+        pass
+
+
+try:
+    try:
+        raise ZeroDivisionError
+    except ZeroDivisionError as ex:
+        raise NameError from ex
+except NameError as ex2:
+    pass

vm/src/frame.rs

@@ -752,7 +752,7 @@ impl Frame {
                     _ => vm.get_none(),
                 };
                 let exception = match argc {
-                    0 => match vm.pop_exception() {
+                    0 => match vm.current_exception() {
                         Some(exc) => exc,
                         None => {
                             return Err(vm.new_exception(
@@ -767,7 +767,7 @@ impl Frame {
                 };
                 let context = match argc {
                     0 => vm.get_none(), // We have already got the exception,
-                    _ => match vm.pop_exception() {
+                    _ => match vm.current_exception() {
                         Some(exc) => exc,
                         None => vm.get_none(),
                     },
@@ -891,7 +891,7 @@ impl Frame {
             bytecode::Instruction::PopException {} => {
                 let block = self.pop_block().unwrap(); // this asserts that the block is_some.
                 if let BlockType::ExceptHandler = block.typ {
-                    assert!(vm.pop_exception().is_some());
+                    vm.pop_exception().expect("Should have exception in stack");
                     Ok(None)
                 } else {
                     panic!("Block type must be ExceptHandler here.")
@@ -983,7 +983,7 @@ impl Frame {
                     }
                 }
                 BlockType::ExceptHandler => {
-                    vm.pop_exception();
+                    vm.pop_exception().expect("Should have exception in stack");
                 }
             }
         }
@@ -1009,7 +1009,7 @@ impl Frame {
                     }
                 },
                 BlockType::ExceptHandler => {
-                    vm.pop_exception();
+                    vm.pop_exception().expect("Should have exception in stack");
                 }
             }
 
@@ -1057,8 +1057,9 @@ impl Frame {
                     }
                 }
                 BlockType::Loop { .. } => {}
-                // Exception was already popped on Raised.
-                BlockType::ExceptHandler => {}
+                BlockType::ExceptHandler => {
+                    vm.pop_exception().expect("Should have exception in stack");
+                }
             }
         }
         Some(exc)

vm/src/vm.rs

@@ -1014,6 +1014,10 @@ impl VirtualMachine {
     pub fn pop_exception(&self) -> Option<PyObjectRef> {
         self.exceptions.borrow_mut().pop()
     }
+
+    pub fn current_exception(&self) -> Option<PyObjectRef> {
+        self.exceptions.borrow().last().cloned()
+    }
 }
 
 impl Default for VirtualMachine {