[pypy-commit] pypy py3k: merge default
pjenvey
noreply at buildbot.pypy.org
Mon Jul 28 01:50:11 CEST 2014
Author: Philip Jenvey <pjenvey at underboss.org>
Branch: py3k
Changeset: r72586:02100350c9f0
Date: 2014-07-27 16:49 -0700
http://bitbucket.org/pypy/pypy/changeset/02100350c9f0/
Log: merge default
diff --git a/lib_pypy/_curses.py b/lib_pypy/_curses.py
--- a/lib_pypy/_curses.py
+++ b/lib_pypy/_curses.py
@@ -309,11 +309,9 @@
#endif
int _m_ispad(WINDOW *win) {
-#if defined WINDOW_HAS_FLAGS
+ // <curses.h> may not have _flags (and possibly _ISPAD),
+ // but for now let's assume that <ncurses.h> always has it
return (win->_flags & _ISPAD);
-#else
- return 0;
-#endif
}
void _m_getsyx(int *yx) {
diff --git a/pypy/interpreter/pyopcode.py b/pypy/interpreter/pyopcode.py
--- a/pypy/interpreter/pyopcode.py
+++ b/pypy/interpreter/pyopcode.py
@@ -204,7 +204,7 @@
elif opcode == opcodedesc.BREAK_LOOP.index:
next_instr = self.BREAK_LOOP(oparg, next_instr)
elif opcode == opcodedesc.CONTINUE_LOOP.index:
- next_instr = self.CONTINUE_LOOP(oparg, next_instr)
+ return self.CONTINUE_LOOP(oparg, next_instr)
elif opcode == opcodedesc.FOR_ITER.index:
next_instr = self.FOR_ITER(oparg, next_instr)
elif opcode == opcodedesc.JUMP_FORWARD.index:
diff --git a/pypy/objspace/std/iterobject.py b/pypy/objspace/std/iterobject.py
--- a/pypy/objspace/std/iterobject.py
+++ b/pypy/objspace/std/iterobject.py
@@ -30,10 +30,6 @@
raise NotImplementedError
def descr_reduce(self, space):
- """
- XXX to do: remove this __reduce__ method and do
- a registration with copy_reg, instead.
- """
from pypy.interpreter.mixedmodule import MixedModule
w_mod = space.getbuiltinmodule('_pickle_support')
mod = space.interp_w(MixedModule, w_mod)
@@ -125,10 +121,6 @@
self.index = space.int_w(self.w_len) + index
def descr_reduce(self, space):
- """
- XXX to do: remove this __reduce__ method and do
- a registration with copy_reg, instead.
- """
from pypy.interpreter.mixedmodule import MixedModule
w_mod = space.getbuiltinmodule('_pickle_support')
mod = space.interp_w(MixedModule, w_mod)
diff --git a/rpython/jit/metainterp/test/test_virtualref.py b/rpython/jit/metainterp/test/test_virtualref.py
--- a/rpython/jit/metainterp/test/test_virtualref.py
+++ b/rpython/jit/metainterp/test/test_virtualref.py
@@ -34,7 +34,7 @@
#
def check_call(op, fname):
assert op.opname == 'direct_call'
- assert op.args[0].value._obj._name == fname
+ assert op.args[0].value._obj._name.startswith(fname)
#
ops = [op for block, op in graph.iterblockops()]
check_call(ops[-3], 'virtual_ref')
diff --git a/rpython/rlib/jit.py b/rpython/rlib/jit.py
--- a/rpython/rlib/jit.py
+++ b/rpython/rlib/jit.py
@@ -340,6 +340,7 @@
# ____________________________________________________________
# VRefs
+ at specialize.argtype(0)
def virtual_ref(x):
"""Creates a 'vref' object that contains a reference to 'x'. Calls
to virtual_ref/virtual_ref_finish must be properly nested. The idea
@@ -351,6 +352,7 @@
return DirectJitVRef(x)
virtual_ref.oopspec = 'virtual_ref(x)'
+ at specialize.argtype(1)
def virtual_ref_finish(vref, x):
"""See docstring in virtual_ref(x)"""
keepalive_until_here(x) # otherwise the whole function call is removed
diff --git a/rpython/translator/platform/windows.py b/rpython/translator/platform/windows.py
--- a/rpython/translator/platform/windows.py
+++ b/rpython/translator/platform/windows.py
@@ -375,21 +375,28 @@
for rule in rules:
m.rule(*rule)
+ if len(headers_to_precompile)>0 and self.version >= 80:
+ # at least from VS2013 onwards we need to include PCH
+ # objects in the final link command
+ linkobjs = 'stdafx.obj @<<\n$(OBJECTS)\n<<'
+ else:
+ linkobjs = '@<<\n$(OBJECTS)\n<<'
+
if self.version < 80:
m.rule('$(TARGET)', '$(OBJECTS)',
[ '$(CC_LINK) /nologo $(LDFLAGS) $(LDFLAGSEXTRA) /out:$@' +\
- ' $(LIBDIRS) $(LIBS) @<<\n$(OBJECTS)\n<<',
+ ' $(LIBDIRS) $(LIBS) ' + linkobjs,
])
else:
m.rule('$(TARGET)', '$(OBJECTS)',
[ '$(CC_LINK) /nologo $(LDFLAGS) $(LDFLAGSEXTRA)' + \
' $(LINKFILES) /out:$@ $(LIBDIRS) $(LIBS) /MANIFEST' + \
- ' /MANIFESTFILE:$*.manifest @<<\n$(OBJECTS)\n<<',
+ ' /MANIFESTFILE:$*.manifest ' + linkobjs,
'mt.exe -nologo -manifest $*.manifest -outputresource:$@;1',
])
m.rule('debugmode_$(TARGET)', '$(OBJECTS)',
[ '$(CC_LINK) /nologo /DEBUG $(LDFLAGS) $(LDFLAGSEXTRA)' + \
- ' $(LINKFILES) /out:$@ $(LIBDIRS) $(LIBS) @<<\n$(OBJECTS)\n<<',
+ ' $(LINKFILES) /out:$@ $(LIBDIRS) $(LIBS) ' + linkobjs,
])
if shared:
More information about the pypy-commit
mailing list