Commits

Ronan Lamy committed db51479

kill TypeSystem.perform_normalizations()

Comments (0)

Files changed (3)

rpython/rtyper/annlowlevel.py

 from rpython.annotator.policy import AnnotatorPolicy
 from rpython.annotator.signature import Sig
 from rpython.annotator.specialize import flatten_star_args
+from rpython.rtyper.normalizecalls import perform_normalizations
 from rpython.rtyper.lltypesystem import lltype, llmemory
 from rpython.flowspace.model import Constant
 from rpython.rlib.objectmodel import specialize
         rtyper = self.rtyper
         translator = rtyper.annotator.translator
         original_graph_count = len(translator.graphs)
-        rtyper.type_system.perform_normalizations(rtyper)
+        perform_normalizations(rtyper)
         for r in self.delayedreprs:
             r.set_setup_delayed(False)
         rtyper.call_all_setups()

rpython/rtyper/rtyper.py

     attachRuntimeTypeInfo, Primitive)
 from rpython.rtyper.rmodel import Repr, inputconst, BrokenReprTyperError
 from rpython.rtyper.typesystem import LowLevelTypeSystem
+from rpython.rtyper.normalizecalls import perform_normalizations
 from rpython.tool.pairtype import pair
 from rpython.translator.unsimplify import insert_empty_block
 
 
         # first make sure that all functions called in a group have exactly
         # the same signature, by hacking their flow graphs if needed
-        self.type_system.perform_normalizations(self)
+        perform_normalizations(self)
         self.exceptiondata.finish(self)
+
         # new blocks can be created as a result of specialize_block(), so
         # we need to be careful about the loop here.
         self.already_seen = {}
-
         self.specialize_more_blocks()
         if self.exceptiondata is not None:
             self.exceptiondata.make_helpers(self)

rpython/rtyper/typesystem.py

 in a graph."""
         raise NotImplementedError()
 
-    def perform_normalizations(self, rtyper):
-        """Prepare the annotator's internal data structures for rtyping
-        with the specified type system.
-        """
-        # default implementation
-        from rpython.rtyper.normalizecalls import perform_normalizations
-        perform_normalizations(rtyper)
 
 class LowLevelTypeSystem(TypeSystem):
     name = "lltypesystem"