engines: no more `super_inits` method used in old-style automatic init

[nit.git] / src / rapid_type_analysis.nit

diff --git a/src/rapid_type_analysis.nit b/src/rapid_type_analysis.nit
index 31f4015..c94e20f 100644 (file)
--- a/src/rapid_type_analysis.nit
+++ b/src/rapid_type_analysis.nit
@@ -23,13 +23,10 @@
 # It is quite efficient but the type set is global and pollutes each call site.
 module rapid_type_analysis
 
-import model
-import modelbuilder
-import typing
-import auto_super_init
+import semantize
 
-import csv # for live_types_to_csv
-import ordered_tree # for live_methods_to_tree
+private import csv # for live_types_to_csv
+private import ordered_tree # for live_methods_to_tree
 
 private import more_collections
 
@@ -207,6 +204,7 @@ class RapidTypeAnalysis
                force_alive("Int")
                force_alive("Float")
                force_alive("Char")
+               force_alive("Pointer")
 
                while not todo.is_empty do
                        var mmethoddef = todo.shift
@@ -226,6 +224,7 @@ class RapidTypeAnalysis
                                v.add_monomorphic_send(vararg, self.modelbuilder.force_get_primitive_method(node, "with_native", vararg.mclass, self.mainmodule))
                        end
 
+                       # TODO? new_msignature
                        var sig = mmethoddef.msignature.as(not null)
                        var osig = mmeth.intro.msignature.as(not null)
                        for i in [0..sig.arity[ do
@@ -240,14 +239,10 @@ class RapidTypeAnalysis
                                if mmeth.name == "init" then
                                        var nclassdef = self.modelbuilder.mclassdef2nclassdef[mmethoddef.mclassdef]
                                        assert mmethoddef == nclassdef.mfree_init
-                                       var super_inits = nclassdef.super_inits
-                                       if super_inits != null then
-                                               #assert args.length == 1
-                                               for su in super_inits do
-                                                       v.add_monomorphic_send(v.receiver, su)
-                                               end
-                                       end
 
+                                       if mmethoddef.mproperty.is_root_init and not mmethoddef.is_intro then
+                                               self.add_super_send(v.receiver, mmethoddef)
+                                       end
                                else
                                        abort
                                end
@@ -263,6 +258,9 @@ class RapidTypeAnalysis
                                                v.add_callsite(auto_super_init)
                                        end
                                end
+                               if npropdef.auto_super_call then
+                                       self.add_super_send(v.receiver, mmethoddef)
+                               end
                        end
 
                        if mmeth.is_new then
@@ -427,8 +425,8 @@ class RapidTypeAnalysis
                if live_super_sends.has(mpropdef) then return
                #print "new super prop: {mpropdef}"
                live_super_sends.add(mpropdef)
-               for t in live_types do
-                       try_super_send(t, mpropdef)
+               for c in live_classes do
+                       try_super_send(c.intro.bound_mtype, mpropdef)
                end
        end
 end
@@ -497,6 +495,11 @@ class RapidTypeVisitor
        fun add_cast_type(mtype: MType) do analysis.add_cast(mtype)
 
        fun add_callsite(callsite: nullable CallSite) do if callsite != null then
+               for m in callsite.mpropdef.initializers do
+                       if m isa MMethod then
+                               analysis.add_send(callsite.recv, m)
+                       end
+               end
                analysis.add_send(callsite.recv, callsite.mproperty)
                analysis.live_callsites.add(callsite)
        end