Author: Remi Meier <remi.me...@gmail.com>
Branch: stmgc-c4
Changeset: r66907:abe3019f8ea3
Date: 2013-09-11 20:05 +0200
http://bitbucket.org/pypy/pypy/changeset/abe3019f8ea3/
Log: merge
diff --git a/pypy/interpreter/executioncontext.py
b/pypy/interpreter/executioncontext.py
--- a/pypy/interpreter/executioncontext.py
+++ b/pypy/interpreter/executioncontext.py
@@ -60,6 +60,7 @@
def enter(self, frame):
if self.space.config.translation.stm:
+ if not self.space.config.translation.jit: # XXX
from pypy.module.thread.stm import enter_frame
enter_frame(self, frame)
frame.f_backref = self.topframeref
@@ -87,6 +88,7 @@
self.space.frame_trace_action.fire()
if self.space.config.translation.stm:
+ if not self.space.config.translation.jit: # XXX
from pypy.module.thread.stm import leave_frame
leave_frame(self, frame)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
