Commits

Alexander Hesse committed a3294d3

Fixed missing conflicts

Comments (0)

Files changed (2)

rpython/jit/codewriter/effectinfo.py

 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

rpython/jit/codewriter/test/test_call.py

     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)