[pypy-commit] lang-smalltalk storage-refactoring-virtual-pc: Oups, removed artifact from earlier merge.

anton_gulenko noreply at buildbot.pypy.org
Thu May 15 13:24:27 CEST 2014


Author: Anton Gulenko <anton.gulenko at googlemail.com>
Branch: storage-refactoring-virtual-pc
Changeset: r831:76403ee39c2e
Date: 2014-05-15 12:48 +0200
http://bitbucket.org/pypy/lang-smalltalk/changeset/76403ee39c2e/

Log:	Oups, removed artifact from earlier merge.

diff --git a/spyvm/interpreter.py b/spyvm/interpreter.py
--- a/spyvm/interpreter.py
+++ b/spyvm/interpreter.py
@@ -109,15 +109,6 @@
                     self.jitted_check_for_interrupt(s_context)
                 self.jit_driver.can_enter_jit(pc=pc, self=self, method=method, s_context=s_context)
     
-            try:
-                self.step(s_context)
-            except Return, nlr:
-                if nlr.s_target_context is not s_context:
-                    s_context._activate_unwind_context(self)
-                    raise nlr
-                else:
-                    s_context.push(nlr.value)
-    
     # This is just a wrapper around loop_bytecodes that handles the stack overflow protection mechanism
     def stack_frame(self, s_new_frame, may_context_switch=True, fresh_context=False):
         if self.max_stack_depth > 0:


More information about the pypy-commit mailing list