Armin Rigo avatar Armin Rigo committed 9e1ad87 Merge

Attempt to kill 5225def4e322, which contains the broken
merges 015d05dac523 and 4dcb9ca387a6.

Comments (0)

Files changed (90)

File contents unchanged.

Add a comment to this file

lib_pypy/pyrepl/unix_console.py

File contents unchanged.

File contents unchanged.

Add a comment to this file

pypy/doc/coding-guide.rst

File contents unchanged.

Add a comment to this file

pypy/doc/how-to-release.rst

File contents unchanged.

Add a comment to this file

pypy/doc/project-ideas.rst

File contents unchanged.

Add a comment to this file

pypy/jit/backend/conftest.py

File contents unchanged.

Add a comment to this file

pypy/jit/backend/llgraph/llimpl.py

File contents unchanged.

Add a comment to this file

pypy/jit/backend/llgraph/runner.py

File contents unchanged.

Add a comment to this file

pypy/jit/backend/llsupport/descr.py

File contents unchanged.

Add a comment to this file

pypy/jit/backend/llsupport/llmodel.py

File contents unchanged.

Add a comment to this file

pypy/jit/backend/llsupport/test/test_gc.py

File contents unchanged.

Add a comment to this file

pypy/jit/backend/model.py

File contents unchanged.

Add a comment to this file

pypy/jit/backend/test/test_random.py

File contents unchanged.

Add a comment to this file

pypy/jit/backend/x86/assembler.py

File contents unchanged.

Add a comment to this file

pypy/jit/backend/x86/codebuf.py

File contents unchanged.

Add a comment to this file

pypy/jit/backend/x86/regalloc.py

File contents unchanged.

Add a comment to this file

pypy/jit/backend/x86/runner.py

File contents unchanged.

Add a comment to this file

pypy/jit/backend/x86/test/test_assembler.py

File contents unchanged.

Add a comment to this file

pypy/jit/backend/x86/test/test_ztranslation.py

File contents unchanged.

Add a comment to this file

pypy/jit/codewriter/codewriter.py

File contents unchanged.

Add a comment to this file

pypy/jit/codewriter/effectinfo.py

File contents unchanged.

Add a comment to this file

pypy/jit/codewriter/jtransform.py

File contents unchanged.

Add a comment to this file

pypy/jit/metainterp/executor.py

File contents unchanged.

Add a comment to this file

pypy/jit/metainterp/optimizeopt/fficall.py

File contents unchanged.

Add a comment to this file

pypy/jit/metainterp/resoperation.py

File contents unchanged.

Add a comment to this file

pypy/jit/metainterp/test/test_ajit.py

File contents unchanged.

Add a comment to this file

pypy/jit/metainterp/test/test_fficall.py

File contents unchanged.

Add a comment to this file

pypy/jit/metainterp/test/test_jitdriver.py

File contents unchanged.

Add a comment to this file

pypy/jit/metainterp/test/test_loop.py

File contents unchanged.

Add a comment to this file

pypy/jit/metainterp/test/test_recursive.py

File contents unchanged.

Add a comment to this file

pypy/jit/metainterp/test/test_warmspot.py

File contents unchanged.

Add a comment to this file

pypy/jit/metainterp/test/test_ztranslation.py

File contents unchanged.

Add a comment to this file

pypy/jit/metainterp/warmspot.py

File contents unchanged.

Add a comment to this file

pypy/module/cpyext/include/modsupport.h

File contents unchanged.

Add a comment to this file

pypy/module/cpyext/presetup.py

File contents unchanged.

Add a comment to this file

pypy/module/cpyext/slotdefs.py

File contents unchanged.

Add a comment to this file

pypy/module/cpyext/test/test_typeobject.py

File contents unchanged.

Add a comment to this file

pypy/module/micronumpy/__init__.py

File contents unchanged.

Add a comment to this file

pypy/module/micronumpy/app_numpy.py

File contents unchanged.

Add a comment to this file

pypy/module/micronumpy/bench/add.py

File contents unchanged.

Add a comment to this file

pypy/module/micronumpy/bench/iterate.py

File contents unchanged.

Add a comment to this file

pypy/module/micronumpy/test/test_dtypes.py

File contents unchanged.

Add a comment to this file

pypy/module/micronumpy/test/test_module.py

File contents unchanged.

Add a comment to this file

pypy/module/micronumpy/test/test_numarray.py

File contents unchanged.

Add a comment to this file

pypy/module/micronumpy/test/test_ufuncs.py

File contents unchanged.

Add a comment to this file

pypy/module/pypyjit/interp_jit.py

File contents unchanged.

Add a comment to this file

pypy/module/pypyjit/test_pypy_c/test_string.py

File contents unchanged.

Add a comment to this file

pypy/module/sys/test/test_sysmodule.py

File contents unchanged.

Add a comment to this file

pypy/objspace/std/objspace.py

File contents unchanged.

Add a comment to this file

pypy/objspace/std/test/test_longobject.py

File contents unchanged.

Add a comment to this file

pypy/rlib/_rffi_stacklet.py

File contents unchanged.

File contents unchanged.

File contents unchanged.

Add a comment to this file

pypy/rlib/rarithmetic.py

File contents unchanged.

File contents unchanged.

File contents unchanged.

File contents unchanged.

Add a comment to this file

pypy/rpython/llinterp.py

File contents unchanged.

Add a comment to this file

pypy/rpython/lltypesystem/ll2ctypes.py

File contents unchanged.

Add a comment to this file

pypy/rpython/lltypesystem/llmemory.py

File contents unchanged.

Add a comment to this file

pypy/rpython/lltypesystem/lltype.py

File contents unchanged.

Add a comment to this file

pypy/rpython/lltypesystem/opimpl.py

File contents unchanged.

Add a comment to this file

pypy/rpython/lltypesystem/rffi.py

File contents unchanged.

Add a comment to this file

pypy/rpython/lltypesystem/test/test_ll2ctypes.py

File contents unchanged.

Add a comment to this file

pypy/rpython/memory/gc/inspector.py

File contents unchanged.

Add a comment to this file

pypy/rpython/memory/gctransform/asmgcroot.py

File contents unchanged.

Add a comment to this file

pypy/rpython/memory/lltypelayout.py

File contents unchanged.

Add a comment to this file

pypy/rpython/memory/test/test_transformed_gc.py

File contents unchanged.

Add a comment to this file

pypy/rpython/module/ll_os.py

File contents unchanged.

Add a comment to this file

pypy/rpython/module/ll_os_stat.py

File contents unchanged.

Add a comment to this file

pypy/rpython/module/ll_time.py

File contents unchanged.

Add a comment to this file

pypy/rpython/module/test/test_ll_os.py

File contents unchanged.

Add a comment to this file

pypy/rpython/module/test/test_ll_os_stat.py

File contents unchanged.

Add a comment to this file

pypy/rpython/module/test/test_posix.py

File contents unchanged.

File contents unchanged.

File contents unchanged.

File contents unchanged.

Add a comment to this file

pypy/translator/c/primitive.py

File contents unchanged.

Add a comment to this file

pypy/translator/c/src/address.h

File contents unchanged.

Add a comment to this file

pypy/translator/c/src/asm_gcc_x86_64.h

File contents unchanged.

Add a comment to this file

pypy/translator/c/src/float.h

File contents unchanged.

Add a comment to this file

pypy/translator/c/src/g_prerequisite.h

File contents unchanged.

Add a comment to this file

pypy/translator/c/src/int.h

File contents unchanged.

Add a comment to this file

pypy/translator/c/src/mem.h

File contents unchanged.

Add a comment to this file

pypy/translator/c/src/obmalloc.c

File contents unchanged.

Add a comment to this file

pypy/translator/c/src/rtyper.h

File contents unchanged.

Add a comment to this file

pypy/translator/c/src/signals.h

File contents unchanged.

Add a comment to this file

pypy/translator/c/test/test_newgc.py

File contents unchanged.

Add a comment to this file

pypy/translator/platform/windows.py

File contents unchanged.

Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.