Commits

Alex Gaynor  committed dc0452a

Make jit/codewriter tests up to date with the new APIs

  • Participants
  • Parent commits f915493
  • Branches kill-someobject

Comments (0)

Files changed (2)

File pypy/jit/codewriter/call.py

         """
         fnptr = self.rtyper.type_system.getcallable(graph)
         FUNC = get_functype(lltype.typeOf(fnptr))
-        assert lltype.Ptr(lltype.PyObject) not in FUNC.ARGS
-        if self.rtyper.type_system.name == 'ootypesystem':
-            XXX
-        else:
-            fnaddr = llmemory.cast_ptr_to_adr(fnptr)
+        assert self.rtyper.type_system.name == "lltypesystem"
+        fnaddr = llmemory.cast_ptr_to_adr(fnptr)
         NON_VOID_ARGS = [ARG for ARG in FUNC.ARGS if ARG is not lltype.Void]
         calldescr = self.cpu.calldescrof(FUNC, tuple(NON_VOID_ARGS),
                                          FUNC.RESULT, EffectInfo.MOST_GENERAL)

File pypy/rlib/jit.py

             self.bookkeeper._jit_annotation_cache[driver] = cache
         for key, s_value in kwds_s.items():
             s_previous = cache.get(key, annmodel.s_ImpossibleValue)
-            s_value = annmodel.unionof(s_previous, s_value)
-            if annmodel.isdegenerated(s_value):
-                raise JitHintError("mixing incompatible types in argument %s"
-                                   " of jit_merge_point/can_enter_jit" %
-                                   key[2:])
+            s_value = annmodel.unionof(s_previous, s_value)  # where="mixing incompatible types in argument %s of jit_merge_point/can_enter_jit" % key[2:]
             cache[key] = s_value
 
         # add the attribute _dont_reach_me_in_del_ (see pypy.rpython.rclass)