Author: Alexander Hesse <[email protected]>
Branch: split-rpython
Changeset: r60032:a3294d331db9
Date: 2013-01-13 17:39 +0100
http://bitbucket.org/pypy/pypy/changeset/a3294d331db9/
Log: Fixed missing conflicts
diff --git a/rpython/jit/codewriter/effectinfo.py
b/rpython/jit/codewriter/effectinfo.py
--- a/rpython/jit/codewriter/effectinfo.py
+++ b/rpython/jit/codewriter/effectinfo.py
@@ -163,14 +163,9 @@
def effectinfo_from_writeanalyze(effects, cpu,
extraeffect=EffectInfo.EF_CAN_RAISE,
oopspecindex=EffectInfo.OS_NONE,
-<<<<<<< local
- can_invalidate=False):
- from rpython.translator.backendopt.writeanalyze import top_set
-=======
can_invalidate=False,
call_release_gil_target=llmemory.NULL):
from rpython.translator.backendopt.writeanalyze import top_set
->>>>>>> other
if effects is top_set or extraeffect == EffectInfo.EF_RANDOM_EFFECTS:
readonly_descrs_fields = None
readonly_descrs_arrays = None
diff --git a/rpython/jit/codewriter/test/test_call.py
b/rpython/jit/codewriter/test/test_call.py
--- a/rpython/jit/codewriter/test/test_call.py
+++ b/rpython/jit/codewriter/test/test_call.py
@@ -173,11 +173,7 @@
py.test.skip("XXX add a test for CallControl.getcalldescr() -> EF_xxx")
def test_releases_gil_analyzer():
-<<<<<<< local
- from rpython.jit.backend.llgraph.runner import LLtypeCPU
-=======
from rpython.jit.backend.llgraph.runner import LLGraphCPU
->>>>>>> other
T = rffi.CArrayPtr(rffi.TIME_T)
external = rffi.llexternal("time", [T], rffi.TIME_T, threadsafe=True)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
