Use Type::Singleton#get_instance_type to obtain exception types

Author: coord-e

lib/typeprof/core/ast/control.rb

@@ -378,14 +378,24 @@ def undefine0(genv)
       end
 
       def install0(genv)
-        cond_tys = @exceptions.map {|exc|
-          exc.install(genv)
-          Type::Instance.new(genv, genv.resolve_cpath(exc.static_ret.cpath), [])
-        }
+        cond_vtxs = @exceptions.map do |exc|
+          case exc
+          when AST::SplatNode
+            ary_vtx = exc.expr.install(genv)
+            @changes.add_splat_box(genv, ary_vtx).ret
+          else
+            exc.install(genv)
+          end
+        end
+
         if @reference
           @reference.install(genv)
-          @changes.add_edge(genv, Source.new(*cond_tys), @reference.rhs.ret)
+          cond_vtxs.each do |cond_vtx|
+            instance_ty_box = @changes.add_instance_type_box(genv, cond_vtx)
+            @changes.add_edge(genv, instance_ty_box.ret, @reference.rhs.ret)
+          end
         end
+
         if @statements
           @statements.install(genv)
         else

lib/typeprof/core/graph/box.rb

@@ -1032,4 +1032,24 @@ def run0(genv, changes)
       end
     end
   end
+
+  class InstanceTypeBox < Box
+    def initialize(node, genv, singleton_ty_vtx)
+      super(node)
+      @singleton_ty_vtx = singleton_ty_vtx
+      @ret = Vertex.new(node)
+      genv.add_run(self)
+    end
+
+    attr_reader :ret
+
+    def run0(genv, changes)
+      instance_tys = []
+      @singleton_ty_vtx.each_type do |ty|
+        instance_tys << ty.get_instance_type(genv)
+      end
+      source_vtx = Source.new(*instance_tys)
+      changes.add_edge(genv, source_vtx, @ret)
+    end
+  end
 end

lib/typeprof/core/graph/change_set.rb

@@ -141,6 +141,12 @@ def add_type_read_box(genv, type)
       @new_boxes[key] = TypeReadBox.new(@node, genv, type)
     end
 
+    def add_instance_type_box(genv, singleton_ty_vtx)
+      key = [:instance_type, singleton_ty_vtx]
+      return if @new_boxes[key]
+      @new_boxes[key] = InstanceTypeBox.new(@node, genv, singleton_ty_vtx)
+    end
+
     def add_diagnostic(meth, msg)
       @new_diagnostics << TypeProf::Diagnostic.new(@node, meth, msg)
     end