[pypy-commit] pypy reflex-support: merge of branch heads

wlav noreply at buildbot.pypy.org
Thu Jul 14 18:01:09 CEST 2011


Author: Wim Lavrijsen <WLavrijsen at lbl.gov>
Branch: reflex-support
Changeset: r45599:aa6ff948e437
Date: 2011-07-14 09:00 -0700
http://bitbucket.org/pypy/pypy/changeset/aa6ff948e437/

Log:	merge of branch heads

diff --git a/pypy/module/cppyy/interp_cppyy.py b/pypy/module/cppyy/interp_cppyy.py
--- a/pypy/module/cppyy/interp_cppyy.py
+++ b/pypy/module/cppyy/interp_cppyy.py
@@ -264,6 +264,7 @@
 
         space = self.space
         errmsg = 'None of the overloads matched:'
+        jit.promote(self)
         for i in range(len(self.functions)):
             cppyyfunc = self.functions[i]
             try:
diff --git a/pypy/module/cppyy/test/test_zjit.py b/pypy/module/cppyy/test/test_zjit.py
--- a/pypy/module/cppyy/test/test_zjit.py
+++ b/pypy/module/cppyy/test/test_zjit.py
@@ -128,3 +128,4 @@
         space = FakeSpace()
         result = self.meta_interp(f, [], listops=True, backendopt=True, listcomp=True)
         self.check_loops(call=0, call_release_gil=1)
+        self.check_loops(getarrayitem_gc_pure=0, everywhere=True)


More information about the pypy-commit mailing list