X-Git-Url: http://nitlanguage.org diff --git a/src/rapid_type_analysis.nit b/src/rapid_type_analysis.nit index ceca71d..b4cf4ab 100644 --- a/src/rapid_type_analysis.nit +++ b/src/rapid_type_analysis.nit @@ -23,17 +23,15 @@ # 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 redef class ModelBuilder + # Performs a rapid-type-analysis on the program associated with `mainmodule`. fun do_rapid_type_analysis(mainmodule: MModule): RapidTypeAnalysis do var analysis = new RapidTypeAnalysis(self, mainmodule) @@ -113,7 +111,7 @@ class RapidTypeAnalysis # Return a ready-to-save CSV document objet that agregates informations about live types. # Each discovered type is listed in a line, with its status: resolution, liveness, cast-liveness. # Note: types are listed in an alphanumeric order to improve human reading. - fun live_types_to_csv: CSVDocument + fun live_types_to_csv: CsvDocument do # Gather all kind of type var typeset = new HashSet[MType] @@ -123,7 +121,7 @@ class RapidTypeAnalysis typeset.add_all(live_open_cast_types) var types = typeset.to_a (new CachedAlphaComparator).sort(types) - var res = new CSVDocument + var res = new CsvDocument res.header = ["Type", "Resolution", "Liveness", "Cast-liveness"] for t in types do var reso @@ -132,7 +130,7 @@ class RapidTypeAnalysis if t isa MClassType and (live_types.has(t) or live_open_types.has(t)) then live = "LIVE" else live = "DEAD" var cast if live_cast_types.has(t) or live_open_cast_types.has(t) then cast = "CAST LIVE" else cast = "CAST DEAD" - res.add_line(t, reso, live, cast) + res.add_record(t, reso, live, cast) end return res end @@ -207,6 +205,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 @@ -216,7 +215,7 @@ class RapidTypeAnalysis var vararg_rank = mmethoddef.msignature.vararg_rank if vararg_rank > -1 then - var node = self.modelbuilder.mpropdef2npropdef[mmethoddef] + var node = self.modelbuilder.mpropdef2node(mmethoddef) var elttype = mmethoddef.msignature.mparameters[vararg_rank].mtype #elttype = elttype.anchor_to(self.mainmodule, v.receiver) var vararg = self.mainmodule.get_primitive_class("Array").get_mtype([elttype]) @@ -226,6 +225,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 @@ -235,39 +235,37 @@ class RapidTypeAnalysis add_cast(paramtype) end - if not modelbuilder.mpropdef2npropdef.has_key(mmethoddef) then - # It is an init for a class? - 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 + var npropdef = modelbuilder.mpropdef2node(mmethoddef) + + if npropdef isa AClassdef then + # It is an init for a class + assert mmethoddef == npropdef.mfree_init - else - abort + if mmethoddef.mproperty.is_root_init and not mmethoddef.is_intro then + self.add_super_send(v.receiver, mmethoddef) end continue + else if mmethoddef.constant_value != null then + # Make the return type live + v.add_type(mmethoddef.msignature.return_mtype.as(MClassType)) + continue + else if npropdef == null then + abort end - var npropdef = modelbuilder.mpropdef2npropdef[mmethoddef] - - if npropdef isa AMethPropdef then + if npropdef isa AMethPropdef then var auto_super_inits = npropdef.auto_super_inits if auto_super_inits != null then for auto_super_init in auto_super_inits do 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 - v.add_type(v.receiver) - else if mmethoddef.is_intern or mmethoddef.is_extern then + if mmethoddef.is_intern or mmethoddef.is_extern then # UGLY: We force the "instantation" of the concrete return type if any var ret = mmethoddef.msignature.return_mtype if ret != null and ret isa MClassType and ret.mclass.kind != abstract_kind and ret.mclass.kind != interface_kind then @@ -345,15 +343,13 @@ class RapidTypeAnalysis var bound_mtype = mtype.anchor_to(mainmodule, recv) for cd in bound_mtype.collect_mclassdefs(mainmodule) do - if not self.modelbuilder.mclassdef2nclassdef.has_key(cd) then continue - var nclassdef = self.modelbuilder.mclassdef2nclassdef[cd] - for npropdef in nclassdef.n_propdefs do - if not npropdef isa AAttrPropdef then continue - var nexpr = npropdef.n_expr - if nexpr == null then continue + for npropdef in modelbuilder.collect_attr_propdef(cd) do + if not npropdef.has_value then continue + var mpropdef = npropdef.mpropdef.as(not null) var v = new RapidTypeVisitor(self, bound_mtype, mpropdef) - v.enter_visit(nexpr) + v.enter_visit(npropdef.n_expr) + v.enter_visit(npropdef.n_block) end end @@ -440,11 +436,8 @@ class RapidTypeVisitor var receiver: MClassType var mpropdef: MPropDef - init(analysis: RapidTypeAnalysis, receiver: MClassType, mpropdef: MPropDef) + init do - self.analysis = analysis - self.receiver = receiver - self.mpropdef = mpropdef assert not receiver.need_anchor end @@ -497,6 +490,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 @@ -671,13 +669,15 @@ redef class AForExpr abort end v.add_callsite(self.method_next) + var mf = self.method_finish + if mf != null then v.add_callsite(mf) end end redef class ANewExpr redef fun accept_rapid_type_visitor(v) do - var mtype = self.mtype.as(MClassType) + var mtype = self.recvtype.as(not null) v.add_type(mtype) v.add_callsite(callsite) end