furnace 0.1.1 → 0.1.2

data/.gitignore

@@ -3,3 +3,4 @@
 Gemfile.lock
 pkg/*
 .rbx/
+*.sublime-*

data/lib/furnace/cfg/graph.rb

@@ -5,10 +5,16 @@ module Furnace::CFG
 
     def initialize
       @nodes = Set.new
+
+      @source_map = nil
+      @label_map  = {}
     end
 
     def find_node(label)
-      if node = @nodes.find { |n| n.label == label }
+      if node = @label_map[label]
+        node
+      elsif node = @nodes.find { |n| n.label == label }
+        @label_map[label] = node
         node
       else
         raise "Cannot find CFG node #{label}"
@@ -16,19 +22,31 @@ module Furnace::CFG
     end
 
     def eliminate_unreachable!
-      worklist = @nodes.dup
-      while worklist.any?
-        node = worklist.first
-        worklist.delete node
+      queue     = [entry]
+      reachable = Set[]
 
-        next if node == @entry
+      while queue.any?
+        node = queue.shift
+        reachable.add node
 
-        if node.sources.count == 0 ||
-              node.sources == [node]
-          @nodes.delete node
-          flush
+        node.targets.each do |target|
+          unless reachable.include? target
+            queue.push target
+          end
+        end
+
+        if node.exception
+          unless reachable.include? node.exception
+            queue.push node.exception
+          end
         end
       end
+
+      @nodes.each do |node|
+        @nodes.delete node unless reachable.include? node
+      end
+
+      flush
     end
 
     def merge_redundant!
@@ -41,7 +59,9 @@ module Furnace::CFG
         next if target == @exit
 
         if node.targets.count == 1 &&
-            target.sources.count == 1
+            target.sources.count == 1 &&
+            node.exception == target.exception
+
           node.insns.delete node.cti
           @nodes.delete node
           @nodes.delete target
@@ -101,6 +121,9 @@ module Furnace::CFG
               dom[source]
             end.reduce(:&)
 
+            # An exception handler header node has no regular sources.
+            pred = [] if pred.nil?
+
             current = Set[node].merge(pred)
             if current != dom[node]
               dom[node] = current
@@ -150,10 +173,11 @@ module Furnace::CFG
         nodes.replace all_nodes
       end
 
+      loops.default = nil
       loops
     end
 
-    def source_map
+    def sources_for(node)
       unless @source_map
         @source_map = Hash.new { |h, k| h[k] = [] }
 
@@ -162,13 +186,18 @@ module Furnace::CFG
             @source_map[target] << node
           end
         end
+
+        @source_map.each do |node, sources|
+          sources.freeze
+        end
       end
 
-      @source_map
+      @source_map[node]
     end
 
     def flush
       @source_map = nil
+      @label_map.clear
     end
 
     def to_graphviz
@@ -192,6 +221,10 @@ module Furnace::CFG
           node.target_labels.each_with_index do |label, idx|
             graph.edge node.label, label, "#{idx}"
           end
+
+          if node.exception_label
+            graph.edge node.label, node.exception_label, "Exc", color: 'orange'
+          end
         end
       end
     end

data/lib/furnace/cfg/node.rb

@@ -2,17 +2,23 @@ module Furnace::CFG
   class Node
     attr_reader   :cfg, :label
 
-    attr_reader   :instructions, :control_transfer_instruction
-    alias :insns :instructions
-    alias :cti   :control_transfer_instruction
+    attr_accessor :target_labels, :exception_label
+    attr_accessor :instructions, :control_transfer_instruction
 
-    def initialize(cfg, label=nil, insns=[], cti=nil, target_labels=[])
+    alias :insns  :instructions
+    alias :insns= :instructions=
+    alias :cti    :control_transfer_instruction
+    alias :cti=   :control_transfer_instruction=
+
+    def initialize(cfg, label=nil, insns=[], cti=nil,
+            target_labels=[], exception_label=nil)
       @cfg, @label  = cfg, label
 
       @instructions = insns
       @control_transfer_instruction = cti
 
-      @target_labels = target_labels
+      @target_labels   = target_labels
+      @exception_label = exception_label
     end
 
     def target_labels
@@ -22,7 +28,7 @@ module Furnace::CFG
     def targets
       @target_labels.map do |label|
         @cfg.find_node label
-      end
+      end.freeze
     end
 
     def source_labels
@@ -30,7 +36,11 @@ module Furnace::CFG
     end
 
     def sources
-      @cfg.source_map[self]
+      @cfg.sources_for(self)
+    end
+
+    def exception
+      @cfg.find_node @exception_label if @exception_label
     end
 
     def exits?

data/lib/furnace/graphviz.rb

@@ -29,14 +29,21 @@ class Furnace::Graphviz
       label: label
     })
 
-    @code << %Q{#{name.inspect} [#{options.map { |k,v| "#{k}=#{v}" }.join(",")}];\n}
+    @code << %Q{#{name.inspect} #{graphviz_options(options)};\n}
   end
 
-  def edge(from, to, label="")
-    @code << %Q{#{from.inspect} -> #{to.inspect} [label=#{label.inspect}];\n}
+  def edge(from, to, label="", options={})
+    options = options.merge({
+      label: label.inspect
+    })
+    @code << %Q{#{from.inspect} -> #{to.inspect} #{graphviz_options(options)};\n}
   end
 
   def to_s
     @code
   end
+
+  def graphviz_options(options)
+    "[#{options.map { |k,v| "#{k}=#{v}" }.join(",")}]"
+  end
 end

data/lib/furnace/transform.rb

@@ -9,6 +9,5 @@ require "furnace/transform/rubinius/ast_normalize"
 require "furnace/transform/generic/label_normalize"
 require "furnace/transform/generic/cfg_build"
 require "furnace/transform/generic/cfg_normalize"
-require "furnace/transform/generic/anf_build"
 
 require "furnace/transform/optimizing/fold_constants"

data/lib/furnace/version.rb

@@ -1,3 +1,3 @@
 module Furnace
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: furnace
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-19 00:00:00.000000000 Z
+date: 2012-05-06 00:00:00.000000000 Z
 dependencies: []
 description: Furnace is a static code analysis framework for dynamic languages, aimed
   at efficient type and behavior inference.
@@ -28,13 +28,6 @@ files:
 - bin/furnace
 - furnace.gemspec
 - lib/furnace.rb
-- lib/furnace/anf/edge.rb
-- lib/furnace/anf/graph.rb
-- lib/furnace/anf/if_node.rb
-- lib/furnace/anf/in_node.rb
-- lib/furnace/anf/let_node.rb
-- lib/furnace/anf/node.rb
-- lib/furnace/anf/return_node.rb
 - lib/furnace/ast.rb
 - lib/furnace/ast/matcher.rb
 - lib/furnace/ast/matcher/dsl.rb
@@ -55,7 +48,6 @@ files:
 - lib/furnace/code/token.rb
 - lib/furnace/graphviz.rb
 - lib/furnace/transform.rb
-- lib/furnace/transform/generic/anf_build.rb
 - lib/furnace/transform/generic/cfg_build.rb
 - lib/furnace/transform/generic/cfg_normalize.rb
 - lib/furnace/transform/generic/label_normalize.rb
@@ -84,9 +76,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A static code analysis framework
 test_files: []
-has_rdoc: 

data/lib/furnace/anf/edge.rb

@@ -1,6 +0,0 @@
-module Furnace
-  module ANF
-    class Edge < Struct.new(:source, :target, :param)
-    end
-  end
-end

data/lib/furnace/anf/graph.rb

@@ -1,60 +0,0 @@
-module Furnace
-  module ANF
-    class Graph
-      attr_reader   :nodes, :edges
-      attr_accessor :root
-
-      def initialize
-        @root  = nil
-        @nodes = Set.new
-        @edges = Set.new
-      end
-
-      def find(label)
-        @nodes.find { |node| node.label == label }
-      end
-
-      def eliminate_dead_code
-        live_set = search
-        @nodes  &= live_set
-      end
-
-      def search
-        seen_set = Set.new
-        work_set = Set.new
-
-        work_set.add @root
-
-        while work_set.any?
-          node = work_set.first
-          work_set.delete node
-          seen_set.add node
-
-          yield node if block_given?
-
-          node.leaving_edges.map(&:target).each do |target|
-            work_set.add target unless seen_set.include? target
-          end
-        end
-
-        seen_set
-      end
-
-      def to_graphviz
-        Graphviz.new do |graph|
-          @nodes.each do |node|
-            graph.node node.object_id, node.to_human_readable
-
-            case node
-            when ANF::IfNode
-              graph.edge node.object_id, node.leaving_edge(true).target.object_id, "true"
-              graph.edge node.object_id, node.leaving_edge(false).target.object_id, "false"
-            when ANF::LetNode, ANF::InNode
-              graph.edge node.object_id, node.leaving_edge.target.object_id
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/furnace/anf/if_node.rb

@@ -1,17 +0,0 @@
-module Furnace
-  module ANF
-    class IfNode < Node
-      attr_reader :condition
-
-      def initialize(graph, condition)
-        super(graph)
-
-        @condition = condition
-      end
-
-      def to_human_readable
-        "if\n#{humanize @condition}"
-      end
-    end
-  end
-end

data/lib/furnace/anf/in_node.rb

@@ -1,17 +0,0 @@
-module Furnace
-  module ANF
-    class InNode < Node
-      attr_reader :expressions
-
-      def initialize(graph, expressions)
-        super(graph)
-
-        @expressions = expressions
-      end
-
-      def to_human_readable
-        "in\n#{@expressions.map { |e| "#{e.to_sexp(1)}" }.join "\n"}"
-      end
-    end
-  end
-end

data/lib/furnace/anf/let_node.rb

@@ -1,37 +0,0 @@
-module Furnace
-  module ANF
-    class LetNode < Node
-      attr_reader :arguments
-
-      def initialize(graph, arguments)
-        super(graph)
-
-        @arguments = arguments
-      end
-
-      def try_eliminate
-        if identity?
-          entering_edges.each do |edge|
-            edge.target = leaving_edge.target
-          end
-        end
-      end
-
-      def identity?
-        @arguments.reduce(true) { |r, (k, v)| r && (v === k) }
-      end
-
-      def try_propagate
-      end
-
-      def static?(node)
-        [ NilClass, TrueClass, FalseClass, Fixnum, Symbol,
-          AST::LocalVariable, AST::InstanceVariable ].include? node.class
-      end
-
-      def to_human_readable
-        "let\n#{@arguments.map { |k, v| "  #{k} = #{humanize v}" }.join "\n"}"
-      end
-    end
-  end
-end

data/lib/furnace/anf/node.rb

@@ -1,31 +0,0 @@
-module Furnace
-  module ANF
-    class Node
-      attr_reader :graph
-
-      def initialize(graph)
-        @graph = graph
-      end
-
-      def leaving_edges
-        @graph.edges.select { |edge| edge.source == self }
-      end
-
-      def leaving_edge(param=nil)
-        @graph.edges.find   { |edge| edge.source == self && edge.param == param }
-      end
-
-      def entering_edges
-        @graph.edges.select { |edge| edge.target == self }
-      end
-
-      def humanize(node)
-        if node.is_a? AST::Node
-          node.to_sexp
-        else
-          node.inspect
-        end
-      end
-    end
-  end
-end

data/lib/furnace/anf/return_node.rb

@@ -1,17 +0,0 @@
-module Furnace
-  module ANF
-    class ReturnNode < Node
-      attr_reader :result
-
-      def initialize(graph, result)
-        super(graph)
-
-        @result = result
-      end
-
-      def to_human_readable
-        "return\n#{humanize @result}"
-      end
-    end
-  end
-end

data/lib/furnace/transform/generic/anf_build.rb

@@ -1,153 +0,0 @@
-module Furnace
-  module Transform
-    module Generic
-      class ANFBuild
-        include AST::Visitor
-
-        def transform(cfg, method)
-          @method_locals = method.local_names
-
-          @last_label = -1
-          @anf_nodes = Hash.new { |k,v| v }
-          @anf_edges = []
-
-          @anf = ANF::Graph.new
-
-          cfg.nodes.each do |node|
-            @locals = {}
-            @node   = node
-
-            @last_anf_node = nil
-
-            # At this point we can have no more than two edges.
-            @default_edge = node.default_leaving_edge
-            @other_edge   = node.leaving_edge(node.operations.last.metadata[:label])
-
-            # Transform the AST for each node to ANF, removing redundant root nodes
-            # in the process.
-            node.operations.delete_if do |operation|
-              visit operation
-
-              operation.type == :remove
-            end
-
-            # If there were no nodes created, fallback to default CFG edge.
-            @last_anf_node ||= @default_edge.target_label
-
-            # If some operations were done just for side effect, add an InNode.
-            if node.operations.any?
-              anf_in = ANF::InNode.new(@anf, node.operations)
-              @anf.nodes.add anf_in
-
-              @anf_edges << [ anf_in, @last_anf_node ]
-              @last_anf_node = anf_in
-            end
-
-            # If any locals were rebound, add a LetNode.
-            if @locals.any? || node.operations.any?
-              anf_let = ANF::LetNode.new(@anf, passed_locals)
-              @anf.nodes.add anf_let
-
-              @anf_edges << [ anf_let, @last_anf_node ]
-              @last_anf_node = anf_let
-            end
-
-            @anf_nodes[node.label] = @last_anf_node
-          end
-
-          # The root is a CFG node with label (ip) 0.
-          @anf.root = @anf_nodes[0]
-
-          @anf_edges.each do |(source_label, target_label, param)|
-            @anf.edges.add ANF::Edge.new(@anf_nodes[source_label],
-                                         @anf_nodes[target_label],
-                                         param)
-          end
-
-          [ @anf, method ]
-        end
-
-        def passed_locals
-          map = @method_locals.map do |name|
-            # Is the name rebound?
-            if @locals.include?(name)
-              [ name, @locals[name] ]
-            # Is it the middle of function?
-            elsif @node.entering_edges.any?
-              [ name, AST::LocalVariable.new(name) ]
-            # Locals default to nil.
-            else
-              [ name, nil ]
-            end
-          end
-
-          Hash[*map.flatten]
-        end
-
-        # (set-lvar :var value)
-        def on_set_lvar(ast_node)
-          @locals[ast_node.children.first] = ast_node.children.last
-
-          ast_node.update(:remove)
-        end
-
-        # (jump-if compare_to condition)
-        def on_jump_if(ast_node)
-          if ast_node.children.first == true
-            true_edge, false_edge = @other_edge, @default_edge
-          else
-            true_edge, false_edge = @default_edge, @other_edge
-          end
-
-          true_node      = ANF::LetNode.new(@anf, passed_locals)
-          false_node     = ANF::LetNode.new(@anf, passed_locals)
-          @last_anf_node = ANF::IfNode.new(@anf, ast_node.children.last)
-
-          @anf.nodes.merge [ true_node, false_node, @last_anf_node ]
-
-          @anf_edges << [ @last_anf_node, true_node, true   ] <<
-                        [ true_node,  true_edge.target_label  ]
-          @anf_edges << [ @last_anf_node, false_node, false ] <<
-                        [ false_node, false_edge.target_label ]
-
-          ast_node.update(:remove)
-        end
-
-        # (return expression)
-        def on_return(ast_node)
-          @last_anf_node = ANF::ReturnNode.new(@anf, ast_node.children.last)
-
-          @anf.nodes.add @last_anf_node
-
-          ast_node.update(:remove)
-        end
-
-        # (get-lvar :x) -> %x
-        def on_get_lvar(node)
-          node.update(:expand, AST::LocalVariable.new(node.children.first))
-        end
-
-        # AST node labels do not make sense.
-        def on_any(ast_node)
-          ast_node.metadata.delete :label
-        end
-
-        def expand_node(node)
-          node.update(:expand)
-        end
-
-        # Immediates do not have to carry metadata anymore.
-        alias :on_true :expand_node
-        alias :on_false :expand_node
-        alias :on_nil :expand_node
-        alias :on_fixnum :expand_node
-        alias :on_literal :expand_node
-
-        # We have a near infinite supply of small, unoccupied labels.
-        def make_label
-          @last_label -= 1
-        end
-      end
-    end
-  end
-end