Cache Type::Bot instance in GlobalEnv

It is used frequently in hot paths like resolve and filter methods.

Author: mame

lib/typeprof/core/ast/control.rb

@@ -236,7 +236,7 @@ def install0(genv)
         if @lenv.exist_var?(:"*expected_block_ret")
           @lenv.add_next_box(@changes.add_escape_box(genv, @arg.ret))
         end
-        Source.new(Type::Bot.new(genv))
+        Source.new(genv.bot_type)
       end
     end
 
@@ -496,7 +496,7 @@ def install0(genv)
         @arg.install(genv)
         e_ret = @lenv.locals[:"*expected_method_ret"]
         @lenv.add_return_box(@changes.add_escape_box(genv, @arg.ret)) if e_ret
-        Source.new(Type::Bot.new(genv))
+        Source.new(genv.bot_type)
       end
     end
 
@@ -681,7 +681,7 @@ def initialize(raw_node, lenv)
       end
 
       def install0(genv)
-        Source.new(Type::Bot.new(genv))
+        Source.new(genv.bot_type)
       end
     end
 

lib/typeprof/core/ast/sig_type.rb

@@ -304,11 +304,11 @@ def show
 
     class SigTyBaseBottomNode < SigTyNode
       def covariant_vertex0(genv, changes, vtx, subst)
-        changes.add_edge(genv, Source.new(Type::Bot.new(genv)), vtx)
+        changes.add_edge(genv, Source.new(genv.bot_type), vtx)
       end
 
       def contravariant_vertex0(genv, changes, vtx, subst)
-        changes.add_edge(genv, Source.new(Type::Bot.new(genv)), vtx)
+        changes.add_edge(genv, Source.new(genv.bot_type), vtx)
       end
 
       def typecheck(genv, changes, vtx, subst)

lib/typeprof/core/env.rb

@@ -40,6 +40,8 @@ def initialize
       @set_type = Type::Instance.new(self, resolve_cpath([:Set]), [])
       @regexp_type = Type::Instance.new(self, resolve_cpath([:Regexp]), [])
 
+      @bot_type = Type::Bot.new(self)
+
       @run_count = 0
     end
 
@@ -50,6 +52,7 @@ def initialize
     attr_reader :obj_type, :nil_type, :true_type, :false_type, :str_type
     attr_reader :int_type, :float_type, :rational_type, :complex_type
     attr_reader :proc_type, :symbol_type, :method_type, :set_type, :regexp_type
+    attr_reader :bot_type
 
     def gen_ary_type(elem_vtx)
       Type::Instance.new(self, @mod_ary, [elem_vtx])

lib/typeprof/core/graph/box.rb

@@ -791,7 +791,7 @@ def run0(genv, changes)
 
     def resolve(genv, changes, &blk)
       @recv.each_type do |orig_ty|
-        next if orig_ty == Type::Bot.new(genv)
+        next if orig_ty == genv.bot_type
         if @mid == :"*super"
           mid = @node.lenv.cref.mid
           skip = true
@@ -936,7 +936,7 @@ def resolve_included_modules(genv, changes, base_ty_env, ty, mid, &blk)
     def resolve_subclasses(genv, changes)
       # TODO: This does not follow new subclasses
       @recv.each_type do |ty|
-        next if ty == Type::Bot.new(genv)
+        next if ty == genv.bot_type
         base_ty = ty.base_type(genv)
         singleton = base_ty.is_a?(Type::Singleton)
         mod = base_ty.mod

lib/typeprof/core/graph/filter.rb

@@ -112,14 +112,14 @@ def filter(types)
 
     def on_type_added(genv, src_var, added_types)
       if src_var == @base_vtx
-        if @base_vtx.types.size == 1 && @base_vtx.types.include?(Type::Bot.new(genv))
+        if @base_vtx.types.size == 1 && @base_vtx.types.include?(genv.bot_type)
           @next_vtx.on_type_removed(genv, self, @types.keys & @next_vtx.types.keys) # XXX: smoke/control/bot2.rb
         end
       else
         added_types.each do |ty|
           @types[ty] = true
         end
-        if @base_vtx.types.size == 1 && @base_vtx.types.include?(Type::Bot.new(genv))
+        if @base_vtx.types.size == 1 && @base_vtx.types.include?(genv.bot_type)
           # ignore
         else
           @next_vtx.on_type_added(genv, self, added_types - @next_vtx.types.keys) # XXX: smoke/control/bot4.rb
@@ -129,7 +129,7 @@ def on_type_added(genv, src_var, added_types)
 
     def on_type_removed(genv, src_var, removed_types)
       if src_var == @base_vtx
-        if @base_vtx.types.size == 1 && @base_vtx.types.include?(Type::Bot.new(genv))
+        if @base_vtx.types.size == 1 && @base_vtx.types.include?(genv.bot_type)
           # ignore
         else
           @next_vtx.on_type_added(genv, self, @types.keys - @next_vtx.types.keys) # XXX: smoke/control/bot4.rb
@@ -138,7 +138,7 @@ def on_type_removed(genv, src_var, removed_types)
         removed_types.each do |ty|
           @types.delete(ty) || raise
         end
-        if @base_vtx.types.size == 1 && @base_vtx.types.include?(Type::Bot.new(genv))
+        if @base_vtx.types.size == 1 && @base_vtx.types.include?(genv.bot_type)
           # ignore
         else
           @next_vtx.on_type_removed(genv, self, removed_types & @next_vtx.types.keys) # XXX: smoke/control/bot2.rb