Commits

Armin Rigo committed a6f1025

Don't ever call makerepr()! That's always bogus.

Comments (0)

Files changed (3)

rpython/rlib/rweakref.py

     def rtyper_makerepr(self, rtyper):
         from rpython.rlib import _rweakvaldict
         return _rweakvaldict.WeakValueDictRepr(rtyper,
-                                               rtyper.makerepr(self.s_key))
+                                               rtyper.getrepr(self.s_key))
 
     def rtyper_makekey_ex(self, rtyper):
         return self.__class__,

rpython/rtyper/rint.py

         if not s_int1.nonneg or not s_int2.nonneg:
             raise TyperError("comparing a signed and an unsigned number")
 
-    repr = hop.rtyper.makerepr(annmodel.unionof(s_int1, s_int2)).as_int
+    repr = hop.rtyper.getrepr(annmodel.unionof(s_int1, s_int2)).as_int
     vlist = hop.inputargs(repr, repr)
     hop.exception_is_here()
     return hop.genop(repr.opprefix+func, vlist, resulttype=Bool)

rpython/rtyper/rtyper.py

     def makekey(self, s_obj):
         return pair(self.type_system, s_obj).rtyper_makekey(self)
 
-    def makerepr(self, s_obj):
+    def _makerepr(self, s_obj):
         return pair(self.type_system, s_obj).rtyper_makerepr(self)
 
     def getrepr(self, s_obj):
             result = self.reprs[key]
         except KeyError:
             self.reprs[key] = None
-            result = self.makerepr(s_obj)
+            result = self._makerepr(s_obj)
             assert not isinstance(result.lowleveltype, ContainerType), (
                 "missing a Ptr in the type specification "
                 "of %s:\n%r" % (s_obj, result.lowleveltype))