analysis: add implementation for reachable methods from initializers analysis

Signed-off-by: Jean-Sebastien Gelinas <calestar@gmail.com>
Signed-off-by: Jean Privat <jean@pryen.org>

diff --git a/src/analysis/analysis.nit b/src/analysis/analysis.nit
index 70c8a70..533175e 100644 (file)
--- a/src/analysis/analysis.nit
+++ b/src/analysis/analysis.nit
@@ -37,6 +37,7 @@ import reachable_from_init_method_analysis
 import cha_analysis
 import rta_analysis
 import reachable_as_init_impl
+import reachable_from_init_method_analysis_impl
 
 # Global Optimizations
 import dead_method_removal
@@ -46,6 +47,7 @@ redef class ToolContext
        readable writable var _global_callgraph: String = "rta"
        readable writable var _no_dead_method_removal: Bool = false
        readable writable var _no_inline_get_set: Bool = false
+       readable writable var _no_callgraph_from_init: Bool = false
 end
 
 redef class Program
@@ -72,7 +74,13 @@ redef class Program
                rai_builder.work
                rai = rai_builder.context
 
-               rfima = new DefaultReachableFromInitMethodAnalysis
+               if not tc.no_callgraph_from_init then
+                       var b = new RFIMABuilder(self)
+                       b.work
+                       rfima = b.context
+               end
+
+               if rfima == null then rfima = new DefaultReachableFromInitMethodAnalysis
        end
 
        # This method will optimize the program (in global compilation only)

diff --git a/src/analysis/reachable_from_init_method_analysis_impl.nit b/src/analysis/reachable_from_init_method_analysis_impl.nit
new file mode 100644 (file)
index 0000000..220ebd9
--- /dev/null
+++ b/src/analysis/reachable_from_init_method_analysis_impl.nit
@@ -0,0 +1,126 @@
+# This file is part of NIT ( http://www.nitlanguage.org ).
+#
+# Copyright 2009 Jean-Sebastien Gelinas <calestar@gmail.com>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This package introduces an algorithm to find all methods reachable
+# from at least one reachable initializer
+package reachable_from_init_method_analysis_impl
+
+import reachable_from_init_method_analysis
+import reachable_method_analysis
+
+class RFIMABuilder
+       readable var _program: Program
+       readable var _context: RFIMAContext = new RFIMAContext
+
+       init (p: Program) do
+               _program = p
+       end
+
+       fun work do
+               program.with_each_live_local_classes !action(c) do
+                       # For each reachable constructors for this class
+                       for g in c.global_properties do
+                               var p = c[g]
+                               if not p.global.is_init_for(c) then continue
+                               assert p isa MMMethod
+                               if not program.rma.as(not null).is_method_reachable(p) then continue
+                               if not c.new_instance_iroutine.has_key(p) then continue
+                               var ir = c.new_instance_iroutine[p]
+
+                               # Process this constructor
+                               context.reachable_from_init_iroutines.add(ir)
+                               (new RFIMAVisitor(context, program)).visit_iroutine(ir)
+                       end
+               end
+       end
+end
+
+class RFIMAContext
+special ReachableFromInitMethodAnalysis
+       readable var _reachable_from_init_iroutines: HashSet[IRoutine] = new HashSet[IRoutine]
+
+       redef fun is_iroutine_reachable_from_init(ir: nullable IRoutine): Bool do
+               return ir != null and reachable_from_init_iroutines.has(ir)
+       end
+
+       redef fun is_method_reachable_from_init(method: MMMethod): Bool do
+               return is_iroutine_reachable_from_init(method.iroutine)
+       end
+end
+
+class RFIMAVisitor
+special ICodeVisitor
+       readable var _context: RFIMAContext
+       readable var _program: Program
+
+       init (context: RFIMAContext, p: Program) do
+               _context = context
+               _program = p
+       end
+
+       fun process_call(iroutine: IRoutine) do
+               if context.is_iroutine_reachable_from_init(iroutine) then return
+               context.reachable_from_init_iroutines.add(iroutine)
+               visit_iroutine(iroutine)
+       end
+
+       redef fun visit_icode(ic)
+       do
+               if ic isa IStaticCall then
+                       # FIXME: take only the last property on the redef. hierarchie
+                       var ir = ic.property.iroutine
+                       if ir != null then process_call(ir)
+               else if ic isa INew then
+                       # FIXME: take only the last property on the redef. hierarchie
+                       var t = ic.stype
+                       var cls = t.for_module(program.module).local_class
+                       var m = cls[ic.property.global].as(MMMethod)
+                       var r = cls.new_instance_iroutine[m]
+                       process_call(r)
+               else if ic isa ISuper then
+                       # Process possible calls
+                       var method = ic.property
+                       for greater in method.prhe.greaters_and_self do
+                               if greater isa MMMethod then
+                                       var ir = greater.iroutine
+                                       if ir != null then process_call(ir)
+                               end
+                       end
+               else if ic isa ICall then
+                       # Process possible calls
+                       var method = ic.property
+                       var ir = method.iroutine
+                       if ir != null then process_call(ir)
+                       for other in method.prhe.smallers do
+                               if other isa MMMethod then
+                                       ir = other.iroutine
+                                       if ir != null then process_call(ir)
+                               end
+                       end
+               else if ic isa ICheckInstance then
+                       var t = ic.stype
+                       var cls = t.for_module(program.module).local_class
+                       var ir = cls.checknew_iroutine
+                       if ir != null then process_call(ir)
+               else if ic isa IInitAttributes then
+                       var t = ic.stype
+                       var cls = t.for_module(program.module).local_class
+                       var ir = cls.init_var_iroutine
+                       if ir != null then process_call(ir)
+               end
+               super
+       end
+end

diff --git a/src/nitc.nit b/src/nitc.nit
index f671cbe..8a3ca9d 100644 (file)
--- a/src/nitc.nit
+++ b/src/nitc.nit
@@ -33,6 +33,7 @@ special AbstractCompiler
        readable var _opt_global_no_STF_opt: OptionBool = new OptionBool("Do not use SFT optimization", "--no-global-SFT-optimization")
        readable var _opt_global_no_DMR_opt: OptionBool = new OptionBool("Do not use dead method removal optimization", "--no-global-DMR-optimization")
        readable var _opt_global_no_inline_get_set: OptionBool = new OptionBool("Do not automatically inline getters/setters", "--no-global-get-set-inlining")
+       readable var _opt_global_no_RFIMA: OptionBool = new OptionBool("Do not use a specialized algorithm to find reachable methods from initializers", "--no-global-RFIM-analysis")
        readable var _opt_global_callgraph: OptionEnum = new OptionEnum(["none", "cha", "rta"], "The algorithm to use to build the callgraph", 2, "--global-callgraph")
        readable var _opt_clibdir: OptionString = new OptionString("NIT C library directory", "--clibdir")
        readable var _opt_bindir: OptionString = new OptionString("NIT tools directory", "--bindir")
@@ -43,7 +44,7 @@ special AbstractCompiler
        init
        do
                super("nitc")
-               option_context.add_option(opt_output, opt_boost, opt_no_cc, opt_global, opt_clibdir, opt_bindir, opt_compdir, opt_extension_prefix, opt_dump, opt_global_no_STF_opt, opt_global_no_DMR_opt, opt_global_callgraph, opt_global_no_inline_get_set)
+               option_context.add_option(opt_output, opt_boost, opt_no_cc, opt_global, opt_clibdir, opt_bindir, opt_compdir, opt_extension_prefix, opt_dump, opt_global_no_STF_opt, opt_global_no_DMR_opt, opt_global_callgraph, opt_global_no_inline_get_set, opt_global_no_RFIMA)
        end
 
        redef fun process_options
@@ -58,6 +59,7 @@ special AbstractCompiler
                use_SFT_optimization = not opt_global_no_STF_opt.value
                no_dead_method_removal = opt_global_no_DMR_opt.value
                no_inline_get_set = opt_global_no_inline_get_set.value
+               no_callgraph_from_init = opt_global_no_RFIMA.value
                global_callgraph = opt_global_callgraph.value_name
                compdir = opt_compdir.value
                if compdir == null then