rta: add live_callsites and live_callsites

[nit.git] / src / rapid_type_analysis.nit

diff --git a/src/rapid_type_analysis.nit b/src/rapid_type_analysis.nit
index 0c50081..978fab4 100644 (file)
--- a/src/rapid_type_analysis.nit
+++ b/src/rapid_type_analysis.nit
@@ -29,6 +29,9 @@ import typing
 import auto_super_init
 
 import csv # for live_types_to_csv
+import ordered_tree # for live_methods_to_tree
+
+private import more_collections
 
 redef class ModelBuilder
        fun do_rapid_type_analysis(mainmodule: MModule): RapidTypeAnalysis
@@ -74,6 +77,36 @@ class RapidTypeAnalysis
        # Live methods.
        var live_methods = new HashSet[MMethod]
 
+       # Live callsites.
+       var live_callsites = new HashSet[CallSite]
+
+       private var live_targets_cache = new HashMap2[MType, MProperty, Set[MMethodDef]]
+
+       # The live targets of a specific callsite.
+       fun live_targets(callsite: CallSite): Set[MMethodDef]
+       do
+               var mtype = callsite.recv
+               var anchor = callsite.anchor
+               if anchor != null then mtype = mtype.anchor_to(callsite.mmodule, anchor)
+               if mtype isa MNullableType then mtype = mtype.mtype
+               assert mtype isa MClassType
+               mtype = mtype.mclass.intro.bound_mtype
+               var mproperty = callsite.mproperty
+               var res = live_targets_cache[mtype, mproperty]
+               if res != null then return res
+               res = new ArraySet[MMethodDef]
+               live_targets_cache[mtype, mproperty] = res
+
+               for c in live_classes do
+                       var tc = c.intro.bound_mtype
+                       if not tc.is_subtype(mainmodule, null, mtype) then continue
+                       var d = mproperty.lookup_first_definition(mainmodule, tc)
+                       res.add d
+               end
+
+               return res
+       end
+
        # Live call-to-super.
        var live_super_sends = new HashSet[MMethodDef]
 
@@ -104,6 +137,30 @@ class RapidTypeAnalysis
                return res
        end
 
+       # Return a ready-to-save OrderedTree object that agregates infomration about live methods.
+       # Note: methods are listed in an alphanumeric order to improve human reading.
+       fun live_methods_to_tree: OrderedTree[Object]
+       do
+               var tree = new OrderedTree[Object]
+               for x in live_methods do
+                       var xn = x.full_name
+                       tree.add(null, xn)
+                       for z in x.mpropdefs do
+                               var zn = z.to_s
+                               if live_methoddefs.has(z) then
+                                       tree.add(xn, zn)
+                                       if live_super_sends.has(z) then
+                                               tree.add(zn, zn + "(super)")
+                                       end
+                               else if live_super_sends.has(z) then
+                                       tree.add(xn, zn + "(super)")
+                               end
+                       end
+               end
+               tree.sort_with(alpha_comparator)
+               return tree
+       end
+
        # Methods that are are still candidate to the try_send
        private var totry_methods = new HashSet[MMethod]
 
@@ -417,7 +474,10 @@ class RapidTypeVisitor
 
        fun add_cast_type(mtype: MType) do analysis.add_cast(mtype)
 
-       fun add_callsite(callsite: nullable CallSite) do if callsite != null then analysis.add_send(callsite.recv, callsite.mproperty)
+       fun add_callsite(callsite: nullable CallSite) do if callsite != null then
+               analysis.add_send(callsite.recv, callsite.mproperty)
+               analysis.live_callsites.add(callsite)
+       end
 end
 
 ###
@@ -573,7 +633,7 @@ redef class ASuperExpr
                        return
                end
 
-               v.analysis.add_super_send(v.receiver, v.mpropdef.as(MMethodDef))
+               v.analysis.add_super_send(v.receiver, mpropdef.as(not null))
        end
 end