ytljit 0.0.6 → 0.0.7

data/lib/ytljit/vm.rb

@@ -110,7 +110,9 @@ LocalVarNode
             if @my_element_node == nil then
               @my_element_node = BaseNode.new(self)
             end
-            @element_node_list = [[sig, @my_element_node, nil]]
+            if @element_node_list == [] then
+              @element_node_list = [[sig[2], sig, @my_element_node, nil]]
+            end
           end
         end
       end
@@ -137,7 +139,9 @@ LocalVarNode
             if @my_element_node == nil then
               @my_element_node = BaseNode.new(self)
             end
-            @element_node_list = [[sig, @my_element_node, nil]]
+            if @element_node_list == [] then
+              @element_node_list = [[sig[2], sig, @my_element_node, nil]]
+            end
           end
         end
       end
@@ -158,12 +162,12 @@ LocalVarNode
           # iv for structure of VM
           @parent = parent
           @code_space = nil
-          @id = nil
+          @id = [1]
           if @parent then
             @id = @parent.id.dup
             @id[-1] = @id[-1] + 1
           else
-            @id = [0]
+            @id = [1]
           end
 
           # iv for type inference
@@ -172,7 +176,7 @@ LocalVarNode
           @element_node_list = []
           @my_element_node = nil
           @type_inference_proc = cs
-          @type_cache = nil
+          @decided_signature = nil
           @is_escape = false
 
           @ti_observer = {}
@@ -261,11 +265,25 @@ LocalVarNode
           end
         end
 
-        def merge_type(dst, src)
+        def marge_type(dst, src)
           res = dst
           src.each do |sele|
-            if !res.include? sele then
-              res.push sele
+            if sele.is_a?(Array) then
+              if !res.include?(sele) then
+                res.push sele
+              end
+            else
+              if res.all? {|e| e.ruby_type != sele.ruby_type or 
+                                 e.boxed != sele.boxed } then
+                res.push sele
+              elsif sele.have_element? and sele.element_type then
+                # Replace type object which have more collect element type
+                res.each_with_index do |rele, i|
+                  if rele == sele and rele.element_type == nil then
+                    res[i] = sele
+                  end
+                end
+              end
             end
           end
 
@@ -284,7 +302,7 @@ LocalVarNode
 =end
           orgsize = dtlist.size
 #          pp "#{dst.class} #{src.class} #{dtlist} #{stlist}"
-          newdt = merge_type(dtlistorg[1], stlist)
+          newdt = marge_type(dtlistorg[1], stlist)
           dst.set_type_list(dsig, newdt)
           dtsize = dtlistorg[0].size + newdt.size
 
@@ -297,13 +315,17 @@ LocalVarNode
           dtlist = dst.element_node_list
           stlist = src.element_node_list
           orgsize = dtlist.size
-          dst.element_node_list = merge_type(dtlist, stlist)
+          dst.element_node_list = marge_type(dtlist, stlist)
           if orgsize != dtlist.size then
             dst.ti_changed
             context.convergent = false
           end
 
-          dst.is_escape ||= src.is_escape
+          if src.is_escape then
+            if dst.is_escape != true then
+              dst.is_escape = src.is_escape
+            end
+          end
         end
 
         def same_type(dst, src, dsig, ssig, context)
@@ -327,29 +349,56 @@ LocalVarNode
           ti_update(dst, src, dsig, ssig, context)
         end
 
-        def add_element_node(sig, enode, index, context)
+        def add_element_node_backward(args, visitnode = {})
+          if visitnode[self] then
+            return
+          end
+
+          add_element_node(*args)
+          visitnode[self] = true
+          @ti_observee.each do |rec|
+            rec.add_element_node_backward(args, visitnode)
+          end
+        end
+
+        def set_escape_node_backward(value = true, visitnode = {})
+          if visitnode[self] then
+            return
+          end
+
+          if @is_escape != true then
+            @is_escape = value
+          end
+          visitnode[self] = true
+          @ti_observee.each do |rec|
+            rec.set_escape_node_backward(value, visitnode)
+          end
+        end
+
+        def add_element_node(curslf, encsig, enode, index, context)
           slfetnode = @element_node_list
-          unless slfetnode.include?(enode)
-            if @element_node_list == nil and index != nil then
-              @element_node_list.push [sig, enode, nil]
-            end
-            @element_node_list.push [sig, enode, index]
-            orgsig = @element_node_list[0][0]
-            orgnode = @element_node_list[0][1]
+          newele = [curslf, encsig, enode, index]
+          if @element_node_list == [] then
+            @element_node_list.push [curslf, encsig, enode, nil]
+          end
+          if !@element_node_list.include?(newele) then
+            @element_node_list.push newele
+            orgsig = @element_node_list[0][1]
+            orgnode = @element_node_list[0][2]
             if orgnode != enode then
-              same_type(orgnode, enode, orgsig, sig, context)
+              same_type(orgnode, enode, orgsig, encsig, context)
             end
             if index != nil then
-              @element_node_list.each do |orgsig, orgnode, orgindex|
+              @element_node_list.each do |sig, orgsig, orgnode, orgindex|
                 if orgindex == index and
                     orgnode != enode then
-                  same_type(orgnode, enode, orgsig, sig, context)
+                  # same_type(orgnode, enode, orgsig, sig, context)
                 end
               end
             end
-                  
+            
             ti_changed
-#            context.convergent = false
+            #            context.convergent = false
           end
         end
 
@@ -358,28 +407,70 @@ LocalVarNode
           context
         end
 
-        def decide_type_core(tlist, local_cache = {})
+        def decide_type_core(tlist, cursig, local_cache = {})
           tlist = tlist.select {|e| e.class != RubyType::DefaultType0 }
+
+          # This is for sitration of same class and differenc element type.
+          # Last element must be local type not propageted type
+          if tlist.size > 1 and tlist.all? {|e| 
+              e.ruby_type == tlist[0].ruby_type and
+              e.boxed == tlist[0].boxed
+            } then
+            return tlist.last
+          end
+
           case tlist.size
           when 0
             RubyType::DefaultType0.new
             
           when 1
-            local_cache[self] = tlist[0]
-            if tlist[0].have_element? then
-              sig = @element_node_list[0][0]
-              node = @element_node_list[0][1]
-              node.decide_type_once(sig, local_cache)
-              tlist[0].element_type = node.type
-            end
             tlist[0]
 
           when 2
-            if tlist[0].ruby_type == tlist[1].ruby_type and
-                tlist[0].boxed then
+            if tlist[0].ruby_type == tlist[1].ruby_type then
+              if tlist[0].abnormal? then
+                tlist[0]
+              else
+                tlist[1]
+              end
+              
+            elsif tlist[0].ruby_type == NilClass then
+              # nil-able type
+              tlist[1].to_box
+
+            elsif tlist[1].ruby_type == NilClass then
+              # nil-able type
+              tlist[0].to_box
+
+            elsif tlist[0].ruby_type == Float and
+                tlist[1].ruby_type == Fixnum then
               tlist[0]
-            else
+
+            elsif tlist[0].ruby_type == Fixnum and
+                tlist[1].ruby_type == Float then
               tlist[1]
+
+            else 
+              RubyType::DefaultType0.new
+            end
+
+          when 3
+            tmptlist = tlist.dup
+            tmptlist.delete_if {|ele| ele.ruby_type == NilClass}
+            if tmptlist.size == 2 and 
+                tmptlist[0].ruby_type == tmptlist[1].ruby_type then
+              if tmptlist[0].abnormal? then
+                tmptlist[0]
+              else
+                tmptlist[1]
+              end
+
+            elsif tmptlist[0].ruby_type == tmptlist[1].ruby_type and
+                  tmptlist[0].ruby_type == tmptlist[2].ruby_type  then
+              tmptlist[1]
+
+            else
+              RubyType::DefaultType0.new
             end
 
           else
@@ -387,16 +478,49 @@ LocalVarNode
           end
         end
 
-        def decide_type_once(sig, local_cache = {})
+        def decide_type_once(cursig, local_cache = {})
           if local_cache[self] then
             return local_cache[self] 
           end
 
-          if @type.equal?(nil) or @type.is_a?(RubyType::DefaultType0) then
-            tlist = type_list(sig).flatten.uniq
-            @type = decide_type_core(tlist, local_cache)
-          else
-            @type
+=begin
+          if @decided_signature and @decided_signature != sig then
+            p cursig
+            p @decided_signature
+            p debug_info
+            p self.class
+            p caller[0]
+            @decided_signature = cursig
+          end
+=end
+
+          if  # @decided_signature != cursig or
+              @type.equal?(nil) or 
+              @type.is_a?(RubyType::DefaultType0) then
+            tlist = type_list(cursig).flatten.uniq
+            @decided_signature = cursig
+            @type = decide_type_core(tlist, cursig, local_cache)
+          end
+
+          if @type.have_element? and 
+              (@type.element_type == nil or
+               @type.element_type == {}) then
+            local_cache[self] = @type
+            etype = {}
+            @element_node_list.each do |ele|
+              sig = ele[1]
+              slf = ele[0]
+              if sig == cursig then
+                node = ele[2]
+                tt = node.decide_type_once(sig, local_cache)
+                etype[ele[3]] ||= []
+                curidx = etype[ele[3]]
+                if !curidx.include?(tt) then
+                  curidx.push tt
+                end
+              end
+            end
+            @type.element_type = etype
           end
 
           @type
@@ -508,27 +632,23 @@ LocalVarNode
         def signature(context, args = @arguments)
           res = []
           cursig = context.to_signature
-          args[0].decide_type_once(cursig)
-          res.push args[0].type
+          res.push args[0].decide_type_once(cursig)
 
           mt, slf = get_send_method_node(cursig)
           if mt and (ynode = mt.yield_node[0]) then
             context.push_signature(args, mt)
             args[1].type = nil
-            args[1].decide_type_once(ynode.signature(context))
-            res.push args[1].type
+            res.push args[1].decide_type_once(ynode.signature(context))
             context.pop_signature
           else
-            args[1].decide_type_once(cursig)
-            res.push args[1].type
-            args[2].decide_type_once(cursig)
-            slf = args[2].type
+            res.push args[1].decide_type_once(cursig)
+            slf = args[2].decide_type_once(cursig)
           end
           res.push slf
 
           args[3..-1].each do |ele|
-            ele.decide_type_once(cursig)
-            res.push ele.type
+#            ele.type = nil
+            res.push ele.decide_type_once(cursig)
           end
 
           res
@@ -560,6 +680,7 @@ LocalVarNode
             end
             context.set_reg_content(FUNC_ARG[2].dst_opecode, context.ret_node)
             
+            context = gen_save_thepr(context)
             context = gen_call(context, fnc, 3)
             context.cpustack_popn(3 * AsmType::MACHINE_WORD.size)
             context.end_arg_reg
@@ -567,9 +688,10 @@ LocalVarNode
             context.ret_reg = RETR
             context.set_reg_content(context.ret_reg, self)
             context.ret_node = self
-            
+
+            @type = nil
             decide_type_once(context.to_signature)
-            if !@type.boxed then 
+            if !@type.boxed then
               context = @type.to_box.gen_unboxing(context)
             end
             
@@ -580,6 +702,7 @@ LocalVarNode
         def compile_c_fixarg(context)
           fnc = nil
           numarg = @arguments.size - 2
+          sig = context.to_signature
           
           context.start_arg_reg
           context.cpustack_pushn(numarg * AsmType::MACHINE_WORD.size)
@@ -609,9 +732,12 @@ LocalVarNode
             else
               # other arg.
               context = arg.compile(context)
-              context.ret_node.decide_type_once(context.to_signature)
-              rtype = context.ret_node.type
-              context = rtype.gen_boxing(context)
+              context.ret_node.decide_type_once(sig)
+              rnode = context.ret_node
+              rtype = rnode.type
+              if rnode.is_escape != true then
+                context = rtype.gen_boxing(context)
+              end
               casm = context.assembler
               casm.with_retry do 
                 casm.mov(FUNC_ARG[argpos], context.ret_reg)
@@ -623,6 +749,7 @@ LocalVarNode
             cursrc = cursrc + 1
           end
           
+          context = gen_save_thepr(context)
           context = gen_call(context, fnc, numarg)
           
           context.cpustack_popn(numarg * AsmType::MACHINE_WORD.size)
@@ -631,7 +758,7 @@ LocalVarNode
           context.ret_reg = RETR
           context.set_reg_content(context.ret_reg, self)
           
-          decide_type_once(context.to_signature)
+          decide_type_once(sig)
           if !@type.boxed then 
             context = @type.to_box.gen_unboxing(context)
           end
@@ -642,13 +769,38 @@ LocalVarNode
         def compile_ytl(context)
           fnc = nil
           numarg = @arguments.size
+          sig = context.to_signature
           
           context.start_arg_reg
           context.start_arg_reg(FUNC_ARG_YTL)
           context.cpustack_pushn(numarg * 8)
-          
-          # push prev env
+
           casm = context.assembler
+          # construct and set exception handler in current frame
+          fstentry = nil
+          if @current_exception_table then
+            [:ensure].each do |kind|
+              ent = nil
+              if entbase = @current_exception_table[kind] then
+                ent = entbase[3]
+              end
+              if ent then
+                csadd = ent.get_code_space(sig).var_base_immidiate_address
+              else
+                csadd = TopTopNode.get_nothing_proc.var_base_immidiate_address
+              end
+              entry = casm.add_value_entry(csadd)
+              fstentry ||= entry.to_immidiate
+            end
+            handoff = OpIndirect.new(BPR, AsmType::MACHINE_WORD.size * 2)
+            casm.with_retry do
+              casm.mov(TMPR, fstentry)
+              casm.mov(handoff, TMPR)
+            end
+            context.set_reg_content(handoff, nil)
+          end
+
+          # push prev env
           if @func.is_a?(YieldNode) then
             prevenv = @frame_info.offset_arg(0, BPR)
             casm.with_retry do 
@@ -709,6 +861,7 @@ LocalVarNode
           context.end_arg_reg
           context.end_arg_reg(FUNC_ARG_YTL)
           context.end_using_reg(fnc)
+
           context
         end
 
@@ -743,6 +896,7 @@ LocalVarNode
                                     context.ret_node)
           end
           
+          context = gen_save_thepr(context)
           context = gen_call(context, fnc, numarg)
           
           context.cpustack_popn(numarg * AsmType::MACHINE_WORD.size)
@@ -756,6 +910,39 @@ LocalVarNode
         end
       end
 
+      module MultipleCodeSpaceUtil
+        def find_cs_by_signature(sig)
+          @code_spaces.each do |csig, val|
+            if csig == sig then
+              return val
+            end
+          end
+
+          nil
+        end
+
+        def add_cs_for_signature(sig)
+          cs = find_cs_by_signature(sig)
+          if cs then
+            return nil
+
+          else
+            cs = CodeSpace.new
+            @code_spaces.push [sig, cs]
+            return cs
+          end
+        end
+
+        def get_code_space(sig)
+          cs = find_cs_by_signature(sig)
+          if cs == nil then
+            cs = CodeSpace.new
+            @code_spaces.push [sig, cs]
+          end
+          cs
+        end
+      end
+
       class DummyNode
         def collect_info(context)
           context
@@ -775,11 +962,12 @@ LocalVarNode
       class TopNode<BaseNode
         include HaveChildlenMixin
         include NodeUtil
+        include MultipleCodeSpaceUtil
+        
         def initialize(parent, name = nil)
           super(parent)
           @name = name
           @code_spaces = [] # [[nil, CodeSpace.new]]
-          @orig_modified_local_var = []
           @yield_node = []
           if @parent then
             @classtop = search_class_top
@@ -788,14 +976,15 @@ LocalVarNode
           end
           @end_nodes = []
           @signature_cache = []
+          @exception_table = nil
         end
 
         attr_accessor :name
         attr          :end_nodes
-        attr          :orig_modified_local_var
         attr          :yield_node
 
         attr          :signature_cache
+        attr_accessor :exception_table
 
         def modified_instance_var
           search_end.modified_instance_var
@@ -805,28 +994,6 @@ LocalVarNode
           yield @body
         end
 
-        def find_cs_by_signature(sig)
-          @code_spaces.each do |csig, val|
-            if csig == sig then
-              return val
-            end
-          end
-
-          nil
-        end
-
-        def add_cs_for_signature(sig)
-          cs = find_cs_by_signature(sig)
-          if cs then
-            return nil
-
-          else
-            cs = CodeSpace.new
-            @code_spaces.push [sig, cs]
-            return cs
-          end
-        end
-
         def add_arg_to_args(args, addnum)
           if args.is_a?(Integer) then
             args = args + addnum
@@ -918,6 +1085,15 @@ LocalVarNode
           context.yield_node.push []
           context = @body.collect_info(context)
           @yield_node = context.yield_node.pop
+          if @exception_table then
+            @exception_table.each do |kind, lst|
+              lst.each do |st, ed, cnt, body|
+                if body then
+                  context = body.collect_info(context)
+                end
+              end
+            end
+          end
           context
         end
 
@@ -935,6 +1111,17 @@ LocalVarNode
           
           context.push_signature(signode, self)
           context = @body.collect_candidate_type(context)
+
+          if @exception_table then
+            @exception_table.each do |kind, lst|
+              lst.each do |st, ed, cnt, body|
+                if body then
+                  context = body.collect_candidate_type(context)
+                end
+              end
+            end
+          end
+
           context.pop_signature
 
           @end_nodes.each do |enode|
@@ -946,11 +1133,12 @@ LocalVarNode
 
         def disp_signature
           tcontext = CompileContext.new(self)
+          print "#{debug_info.inspect}\n"
           print "#{@classtop.klass_object}##{@name} "
           @code_spaces.each do |sig, cs|
             print sig, " -> "
             tl = type_list(sig).flatten.uniq
-            print decide_type_core(tl).inspect, "\n"
+            print decide_type_core(tl, sig).inspect, "\n"
             pp tl
 #            print "CodeSpace 0x#{cs.base_address.to_s(16)}\n"
             print "CodeSpace #{cs.inspect}\n"
@@ -971,6 +1159,16 @@ LocalVarNode
             context = gen_method_prologue(context)
             context = compile_init(context)
             context = @body.compile(context)
+
+            if @exception_table then
+              @exception_table.each do |kind, lst|
+                lst.each do |st, ed, cnt, body|
+                  if body then
+                    context = body.compile(context)
+                  end
+                end
+              end
+            end
             context.current_method_signature.pop
           end
 
@@ -1010,9 +1208,6 @@ LocalVarNode
 
       class BlockTopNode<MethodTopNode
         def collect_info(context)
-          @orig_modified_local_var = context.modified_local_var.last.map {|e|
-            e.dup
-          }
           context.modified_local_var.last.push Hash.new
           context = @body.collect_info(context)
           context.modified_local_var.last.pop
@@ -1033,6 +1228,8 @@ LocalVarNode
 
         def initialize(parent, klassobj, name = nil)
           super(parent, name)
+          @before_search_module = []
+          @after_search_module = []
           @constant_tab = {}
           @method_tab = {}
           @klass_object = klassobj
@@ -1050,6 +1247,8 @@ LocalVarNode
         attr :method_tab
         attr :klassclass
         attr :klassclass_node
+        attr :before_search_module
+        attr :after_search_module
 
         def collect_info(context)
           context.modified_local_var.push [{}]
@@ -1071,6 +1270,7 @@ LocalVarNode
             clsclsnode.body = DummyNode.new
             @klassclass_node = clsclsnode
           end
+          @klassclass_node
         end
 
         def get_method_tab(klassobj = @klass_object)
@@ -1092,15 +1292,54 @@ LocalVarNode
           end
         end
 
+        def add_before_search_module(scope, mod)
+          clsnode = @@class_top_tab[@klass_object]
+          clsnode.before_search_module.each do |scope, modnode|
+            if modnode == mod then
+              return
+            end
+          end
+          clsnode.before_search_module.push [scope, mod]
+        end
+
+        def add_after_search_module(scope, mod)
+          clsnode = @@class_top_tab[@klass_object]
+          clsnode.after_search_module.each do |scope, modnode|
+            if modnode == mod then
+              return
+            end
+          end
+          clsnode.before_search_module.unshift [scope, mod]
+        end
+
         def search_method_with_super(name, klassobj = @klass_object)
           clsnode = @@class_top_tab[klassobj]
           if clsnode then
+            clsnode.before_search_module.each do |scope, mod|
+              mtab = mod.get_method_tab
+              if val = mtab[name] then
+                return [val, mod]
+              end
+            end
+
             mtab = clsnode.get_method_tab
             if val = mtab[name] then
               return [val, clsnode]
             end
-            
-            return search_method_with_super(name, klassobj.superclass)
+
+            clsnode.after_search_module.each do |scope, mod|
+              mtab = mod.get_method_tab
+              if val = mtab[name] then
+                return [val, mod]
+              end
+            end
+
+            if klassobj.is_a?(Class) then
+              return search_method_with_super(name, klassobj.superclass)
+            else
+              # klassobj is Module
+              return search_method_with_super(name, Object)
+            end
           end
 
           [nil, nil]
@@ -1113,7 +1352,7 @@ LocalVarNode
             if val = ctab[name] then
               return [val, clsnode]
             end
-            
+
             return search_constant_with_super(name, klassobj.superclass)
           end
 
@@ -1139,6 +1378,7 @@ LocalVarNode
           end
 
           context.visited_top_node[self] = true
+          @signature_cache.push sig
           
           context.push_signature(signode, self)
           context = @body.collect_candidate_type(context)
@@ -1193,11 +1433,22 @@ LocalVarNode
         include MethodTopCodeGen
         @@frame_struct_tab = {}
         @@local_object_area = Runtime::Arena.new
+        @@unwind_proc = CodeSpace.new
+        @@nothing_proc = CodeSpace.new
 
         def self.get_frame_struct_tab
           @@frame_struct_tab
         end
 
+        def self.get_unwind_proc
+          @@unwind_proc
+        end
+
+
+        def self.get_nothing_proc
+          @@nothing_proc
+        end
+
         def initialize(parent, klassobj, name = :top)
           super
           
@@ -1206,10 +1457,10 @@ LocalVarNode
           @id.push 0
 
           @frame_struct_array = []
-          @unwind_proc = CodeSpace.new
           @init_node = nil
-          init_unwind_proc
-          add_code_space(nil, @unwind_proc)
+
+          # Dummy for marshal
+          @op_var_value_instaces = nil
         end
 
         attr_accessor :init_node
@@ -1231,16 +1482,28 @@ LocalVarNode
         end
 
         def init_unwind_proc
-          asm = Assembler.new(@unwind_proc)
+          asm = Assembler.new(@@unwind_proc)
+          # Make linkage of frame pointer
+          asm.with_retry do
+            asm.mov(SPR, BPR)
+            asm.pop(BPR)
+            # must be asm.pop(THEPR)? Maybe not because release caller
+            asm.pop(TMPR)   # Dummy pop THEPR
+            asm.pop(TMPR2)   # exception handler
+            asm.mov(SPR, BPR)
+            asm.pop(BPR) # Return address store by call inst.
+            asm.pop(TMPR) # return address
+            asm.add(TMPR2, TMPR3)  # TMPR3 store offset of exception handler
+            asm.mov(TMPR2, INDIRECT_TMPR2)
+            asm.and(TMPR2, TMPR2)
+            asm.jz(@@unwind_proc.var_base_address)
+            asm.jmp(TMPR2)
+          end
+
+          asm = Assembler.new(@@nothing_proc)
           # Make linkage of frame pointer
-          finfo = OpIndirect.new(TMPR3, AsmType::MACHINE_WORD.size)
-          retadd = OpIndirect.new(TMPR3, AsmType::MACHINE_WORD.size)
           asm.with_retry do
-            asm.mov(TMPR3, BPR)
-            asm.mov(TMPR3, INDIRECT_TMPR3)
-            asm.mov(TMPR, finfo)
-            asm.mov(TMPR3, INDIRECT_TMPR3)
-            asm.mov(TMPR2, retadd) # Return address store by call inst.
+            asm.ret
           end
         end
         
@@ -1253,6 +1516,9 @@ LocalVarNode
         def collect_info(context)
           if @init_node then
             context = @init_node.collect_info(context)
+          else
+            init_unwind_proc
+            add_code_space(nil, @@unwind_proc)
           end
           super(context)
         end
@@ -1263,12 +1529,31 @@ LocalVarNode
           if @init_node then
             context = @init_node.collect_candidate_type(context, signode, sig)
           end
+
+          # This is for return boxed object to CRuby system
+          if @end_nodes[0] then
+            @end_nodes[0].add_type(sig, RubyType::BaseType.from_object(nil))
+          end
+
           super(context, signode, sig)
         end
 
-        def compile_init(context)
+        def get_arena_address
           ar = @@local_object_area
-          aa = (ar.address + ar.size) & (~0xf)
+          # 2 means used and size
+          ar.raw_address
+        end
+
+        def get_arena_end_address
+          ar = @@local_object_area
+          (ar.body_address + ar.size) & (~0xf)
+        end
+
+        def compile_init(context)
+          addr = lambda {
+            get_arena_end_address
+          }
+          aa = OpVarImmidiateAddress.new(addr) 
           asm = context.assembler
           asm.with_retry do
             asm.mov(THEPR, aa)
@@ -1282,6 +1567,51 @@ LocalVarNode
           end
           super(context)
         end
+
+        def code_store_hook
+          @op_var_value_instaces = OpVarValueMixin.instances
+        end
+
+        def update_after_restore
+          @op_var_value_instaces.each do |ins|
+            ins.refer.each do |stfn|
+              stfn.call
+            end
+          end
+        end
+      end
+
+      class ExceptionTopNode<TopNode
+        include HaveChildlenMixin
+        include NodeUtil
+        include MultipleCodeSpaceUtil
+        include MethodEndCodeGen
+
+        def initialize(parent, name = nil)
+          super
+          @code_spaces = []
+        end
+
+        def collect_info(context)
+          @body.collect_info(context)
+        end
+
+        def collect_candidate_type(context)
+          @body.collect_candidate_type(context)
+        end
+
+        def compile(context)
+          sig = context.to_signature
+          cs = get_code_space(sig)
+          oldcs = context.set_code_space(cs)
+          context = @body.compile(context)
+          asm = context.assembler
+          asm.with_retry do
+            asm.ret
+          end
+          context.set_code_space(oldcs)
+          context
+        end
       end
 
       class LocalFrameInfoNode<BaseNode
@@ -1379,7 +1709,7 @@ LocalVarNode
           rc
         end
 
-        def alloca(size)
+        def static_alloca(size)
 #          base = -offset_by_byte(0)
           @alloca_area_size += size
           -(@local_area_size + @alloca_area_size)
@@ -1394,15 +1724,18 @@ LocalVarNode
         def compile(context)
           context = super(context)
           siz = @local_area_size + @alloca_area_size
-          if  siz != 0 then
+          if siz != 0 and !(@parent.is_a?(ExceptionTopNode)) then
             asm = context.assembler
             asm.with_retry do
               asm.sub(SPR, siz)
             end
+            context.cpustack_pushn(siz)
+            context = @body.compile(context)
+            context.cpustack_popn(siz)
+          else
+            context = @body.compile(context)
           end
-          context.cpustack_pushn(siz)
-          context = @body.compile(context)
-          context.cpustack_popn(siz)
+
           context
         end
       end
@@ -1451,7 +1784,7 @@ LocalVarNode
             cursig2 = context.to_signature(-2)
             if tobj then
               same_type(self, tobj, cursig, cursig2, context)
-              same_type(tobj, self, cursig2, cursig, context)
+#              same_type(tobj, self, cursig2, cursig, context)
             end
           end
           context
@@ -1531,6 +1864,18 @@ LocalVarNode
 
       class ClassEndNode<MethodEndNode
         include MethodEndCodeGen
+
+        def initialize(parent)
+          super(parent)
+          @modified_instance_var = nil
+        end
+
+        attr :modified_instance_var
+
+        def collect_info(context)
+          @modified_instance_var = context.modified_instance_var
+          context
+        end
       end
 
       # Set result of method/block
@@ -1550,11 +1895,18 @@ LocalVarNode
         end
 
         def collect_candidate_type(context)
-          @is_escape = true
-          context = @value_node.collect_candidate_type(context)
           cursig = context.to_signature
+          context = @value_node.collect_candidate_type(context)
           same_type(self, @value_node, cursig, cursig, context)
           same_type(@value_node, self, cursig, cursig, context)
+
+          rtype = decide_type_once(cursig)
+          rrtype = rtype.ruby_type
+          if !rtype.boxed and rrtype != Fixnum and rrtype != Float then
+            set_escape_node_backward(:export_object)
+          else
+            set_escape_node_backward(:not_export)
+          end
           @body.collect_candidate_type(context)
         end
 
@@ -1598,7 +1950,7 @@ LocalVarNode
           super(parent)
           @local_label = parent
         end
-
+        
         def collect_candidate_type(context)
           @local_label.come_from.values.each do |vnode|
             if vnode then
@@ -1612,27 +1964,32 @@ LocalVarNode
         def compile(context)
           context = super(context)
           context.ret_node = self
-          context.ret_reg = RETR
-          context.set_reg_content(RETR, self)
+          context.ret_reg = @local_label.res_area
           context
         end
       end
 
       class LocalLabel<BaseNode
         include HaveChildlenMixin
+        include NodeUtil
+        include MultipleCodeSpaceUtil
+
         def initialize(parent, name)
           super(parent)
           @name = name
           @come_from = {}
           @come_from_val = []
-          @code_space = CodeSpace.new
-          @value_node = PhiNode.new(self)
+          @current_signature = nil
+          @code_spaces = []
+          @value_node = nil
           @modified_local_var_list = []
+          @res_area = nil
         end
 
         attr          :name
         attr          :come_from
-        attr          :value_node
+        attr_accessor :value_node
+        attr          :res_area
 
         def traverse_childlen
           yield @value_node
@@ -1673,9 +2030,12 @@ LocalVarNode
           modlocvar = context.modified_local_var.last.map {|ele| ele.dup}
           @modified_local_var_list.push modlocvar
           if @modified_local_var_list.size == 1 then
+            tnode = search_frame_info
+            offset = tnode.static_alloca(8)
+            @res_area = OpIndirect.new(BPR, offset)
             @body.collect_info(context)
           elsif @modified_local_var_list.size == @come_from.size then
-            context.merge_local_var(@modified_local_var_list)
+            context.marge_local_var(@modified_local_var_list)
             @body.collect_info(context)
           else
             context
@@ -1688,13 +2048,11 @@ LocalVarNode
             context = valnode.compile(context)
             asm = context.assembler
             if !context.ret_reg.is_a?(OpRegXMM) then
-              if RETR != context.ret_reg then
-                asm.with_retry do
-                  asm.mov(RETR, context.ret_reg)
-                end
-                context.set_reg_content(RETR, context.ret_node)
-                context.ret_reg = RETR
+              asm.with_retry do
+                asm.mov(TMPR, context.ret_reg)
+                asm.mov(@res_area, TMPR)
               end
+              context.ret_reg = TMPR
             end
           end
 
@@ -1712,15 +2070,21 @@ LocalVarNode
         end
 
         def collect_candidate_type(context, sender = nil)
-          if @come_from.keys[0] == sender then
-            @body.collect_candidate_type(context)
+           if @come_from.keys[0] == sender then
+             @body.collect_candidate_type(context)
           else
             context
           end
-        end
+       end
 
         def compile(context)
           context = super(context)
+          if @current_signature == nil or
+              @current_signature != context.to_signature then
+            @come_from_val = []
+            @current_signature = context.to_signature
+          end
+
           @come_from_val.push context.ret_reg
           
           if @come_from_val.size == 1 then
@@ -1761,12 +2125,13 @@ LocalVarNode
         end
 
         def compile(context)
+          sig = context.to_signature
           context = super(context)
           context = @jmp_to_node.compile_block_value(context, self)
+          jmptocs = @jmp_to_node.get_code_space(sig)
 
-          jmptocs = @jmp_to_node.code_space
-          context = @cond.compile(context)
           curas = context.assembler
+          context = @cond.compile(context)
           curas.with_retry do
             if context.ret_reg != TMPR then
               curas.mov(TMPR, context.ret_reg)
@@ -1826,13 +2191,15 @@ LocalVarNode
         end
 
         def compile(context)
+          sig = context.to_signature
           context = super(context)
           context = @jmp_to_node.compile_block_value(context, self)
+          jmptocs = @jmp_to_node.get_code_space(sig)
 
-          jmptocs = @jmp_to_node.code_space
           curas = context.assembler
           curas.with_retry do
             curas.jmp(jmptocs.var_base_address)
+            curas.ud2   # Maybe no means but this line may be useful
           end
 
           oldcs = context.set_code_space(jmptocs)
@@ -1842,6 +2209,87 @@ LocalVarNode
         end
       end
 
+      class ThrowNode<BaseNode
+        include HaveChildlenMixin
+        include MethodEndCodeGen
+        include NodeUtil
+
+        def initialize(parent, state, exceptobj)
+          super(parent)
+          @state = state
+          @exception_object = exceptobj
+        end
+
+        def traverse_childlen
+          yield @exception_object
+        end
+
+        def collect_info(context)
+          @exception_object.collect_info(context)
+        end
+
+        def collect_candidate_type(context)
+          @exception_object.collect_candidate_type(context)
+        end
+
+        def gen_unwind(context)
+        end
+
+        def compile_unwind(context)
+          asm = context.assembler
+          handoff = OpIndirect.new(BPR, AsmType::MACHINE_WORD.size * 2)
+          ensureoff = OpIndirect.new(TMPR, 0)
+          asm.with_retry do
+            asm.mov(TMPR, handoff)
+            asm.call(ensureoff)
+          end
+          gen_method_epilogue(context)
+        end
+
+        def compile(context)
+          asm = context.assembler
+          if @state == 0 then
+            context = @exception_object.compile(context)
+            
+          elsif @state == 2 then # break
+            context = @exception_object.compile(context)
+            asm.with_retry do
+              if context.ret_reg != RETR then
+                asm.mov(RETR, context.ret_reg)                
+              end
+            end
+            context.set_reg_content(RETR, context.ret_node)
+            # two epilogue means block and method which is called with block
+            context = gen_method_epilogue(context)
+            # instead of gen_method_epilogue because may need to ensure proc.
+            context = compile_unwind(context)
+            asm.with_retry do
+              asm.ret
+            end
+
+          elsif @state == 1 then # return
+            if context.ret_reg != RETR then
+              asm.mov(RETR, context.ret_reg)                
+            end
+            context.set_reg_content(RETR, context.ret_node)
+            tnode = search_frame_info
+            finfo = tnode
+            depth = 0
+            while finfo.parent.is_a?(BlockTopNode)
+              finfo = finfo.previous_frame
+              # two epilogue means block and method which is called with block
+              context = gen_method_epilogue(context)
+              context = compile_unwind(context)
+            end
+            context = compile_unwind(context)
+            asm.with_retry do
+              asm.ret
+            end
+          end
+          context
+        end
+      end
+
       # Holder of Nodes Assign. These assignes execute parallel potencially.
       class LetNode<BaseNode
         include HaveChildlenMixin
@@ -1855,7 +2303,7 @@ LocalVarNode
         def initialize(node)
           super(node.parent)
           @node = node
-          @first_compile = true
+          @compiled_by_signature = []
           @res_area = nil
         end
 
@@ -1865,7 +2313,7 @@ LocalVarNode
 
         def collect_info(context)
           tnode = search_frame_info
-          offset = tnode.alloca(8)
+          offset = tnode.static_alloca(8)
           @res_area = OpIndirect.new(BPR, offset)
           @node.collect_info(context)
         end
@@ -1878,14 +2326,24 @@ LocalVarNode
         end
 
         def compile(context)
-          if @first_compile then
+          sig = context.to_signature
+          if !@compiled_by_signature.include?(sig) then
             context = @node.compile(context)
             asm = context.assembler
-            asm.with_retry do
-              asm.mov(@res_area, context.ret_reg)
+            if context.ret_reg.is_a?(OpRegistor) then
+              asm.with_retry do
+                asm.mov(@res_area, context.ret_reg)
+              end
+              context.set_reg_content(@res_area, context.ret_node)
+            else
+              asm.with_retry do
+                asm.mov(TMPR, context.ret_reg)
+                asm.mov(@res_area, TMPR)
+              end
+              context.set_reg_content(@res_area, context.ret_node)
             end
             context.set_reg_content(@res_area, self)
-            @first_compile = false
+            @compiled_by_signature.push sig
 
             context
           else
@@ -1893,7 +2351,7 @@ LocalVarNode
             asm.with_retry do
               asm.mov(RETR, @res_area)
             end
-            context.set_reg_content(@res_area, self)
+            context.set_reg_content(RETR, self)
             context.ret_reg = RETR
             context.ret_node = self
 
@@ -1915,24 +2373,40 @@ LocalVarNode
         attr :value
 
         def collect_candidate_type(context)
-          # ??? 
-          if @type == nil then 
+          sig = context.to_signature
+          if @type_list != [[], []] then
+            @type = decide_type_once(sig)
+          elsif @type == nil then 
             @type = RubyType::BaseType.from_object(@value) 
           end
 
-          sig = context.to_signature
           case @value
           when Array
             add_type(sig, @type)
             @value.each do |ele|
               etype = RubyType::BaseType.from_object(ele)
-              @element_node_list[0][1].add_type(sig, etype)
+              @element_node_list[0][2].add_type(sig, etype)
             end
 
           when Range
             @type = @type.to_box
             add_type(sig, @type)
-
+            if @type.args == nil then
+              @type.args = []
+              ele = @value.first
+              fstnode = LiteralNode.new(self, ele)
+              context = fstnode.collect_candidate_type(context)
+              @type.args.push fstnode
+              ele = @value.last
+              sndnode = LiteralNode.new(self, ele)
+              @type.args.push sndnode
+              context = sndnode.collect_candidate_type(context)
+              ele = @value.exclude_end?
+              exclnode = LiteralNode.new(self, ele)
+              @type.args.push exclnode
+              context = exclnode.collect_candidate_type(context)
+              add_element_node(@type, sig, fstnode, [0], context)
+            end
           else
             add_type(sig, @type)
           end
@@ -1940,6 +2414,10 @@ LocalVarNode
           context
         end
 
+        def compile_get_constant(context)
+          compile(context)
+        end
+
         def compile(context)
           context = super(context)
 
@@ -2094,6 +2572,7 @@ LocalVarNode
             asm.mov(PTMPR, prevenv)
             asm.mov(PTMPR, slfarg)
           end
+          context.set_reg_content(PTMPR, nil)
           context.ret_reg2 = PTMPR
           
           context.ret_reg = @frame_info.offset_arg(1, BPR)
@@ -2130,7 +2609,10 @@ LocalVarNode
 
         def compile(context)
           context = super(context)
-          context.ret_reg = OpMemAddress.new(address_of(@name))
+          addr = lambda { 
+            address_of(@name) 
+          }
+          context.ret_reg = OpVarMemAddress.new(addr)
           context.ret_node = self
           context.set_reg_content(context.ret_reg, self)
           context
@@ -2168,8 +2650,7 @@ LocalVarNode
             @reciever = @parent.class_top
             if @reciever == @parent.search_top and 
                 !@reciever.is_a?(TopTopNode) then
-              @reciever.make_klassclass_node
-              @reciever = @reciever.klassclass_node
+              @reciever = @reciever.make_klassclass_node
             end
           else
             @reciever = sendnode.arguments[2]
@@ -2203,6 +2684,10 @@ LocalVarNode
               if recobj.is_a?(ClassClassWrapper) then
                 recobj = recobj.value
               end
+              if recobj and !recobj.is_a?(Class) then
+                # recobj is Module
+                recobj = Object
+              end
               if recobj then
                 addr = recobj.method_address_of(@name)
                 if addr then
@@ -2220,8 +2705,21 @@ LocalVarNode
               end
             end
           else
-            rtype = @reciever.decide_type_once(context.to_signature)
+            sig = context.to_signature
+=begin
+            p @name
+            p @parent.debug_info
+            p context.to_signature
+            p sig
+            p @parent.arguments[2].class
+=end
+
+            if @reciever.type_list(sig).flatten.uniq.size != 0 then
+              @reciever.type = nil
+            end
+            rtype = @reciever.decide_type_once(sig)
             rklass = rtype.ruby_type_raw
+
             knode = ClassTopNode.get_class_top_node(rklass)
             if knode and knode.search_method_with_super(@name)[0] then
               @calling_convention = :ytl
@@ -2242,11 +2740,12 @@ LocalVarNode
                 end
                 begin
                   mth = rklass.instance_method(@name)
+                  @ruby_reciever = rtype.ruby_type_raw
                 rescue NameError
                   p @parent.debug_info
-                  p context.to_signature
+                  p sig
                   p @name
-#                  p @reciever.func.reciever.class
+                  p @reciever.class
                   p @reciever.instance_eval {@type_list }
 =begin
                   mc = @reciever.get_send_method_node(context.to_signature)[0]
@@ -2256,7 +2755,6 @@ LocalVarNode
 =end
                   raise
                 end
-                @ruby_reciever = rtype.ruby_type_raw
               end
 
               if variable_argument?(mth.parameters) then
@@ -2283,12 +2781,21 @@ LocalVarNode
             if mtop then
               sig = @parent.signature(context)
               cs = mtop.find_cs_by_signature(sig)
-              context.ret_reg = cs.var_base_address
+              if cs then
+                context.ret_reg = cs.var_base_address
+              else
+                # Maybe not reached program
+                context.ret_reg = 0
+              end
             else
               recobj = @reciever.klass_object
               if recobj.is_a?(ClassClassWrapper) then
                 recobj = recobj.value
               end
+              if recobj and !recobj.is_a?(Class) then
+                # recobj is Module
+                recobj = Object
+              end
               if recobj then
                 addr = lambda {
                   recobj.method_address_of(@name)
@@ -2308,9 +2815,12 @@ LocalVarNode
             end
           else
             context = @reciever.compile(context)
-            rtype = context.ret_node.decide_type_once(context.to_signature)
+            rnode = context.ret_node
+            rtype = rnode.decide_type_once(context.to_signature)
             if @calling_convention != :ytl then
-              context = rtype.gen_boxing(context)
+              if rnode.is_escape != true then
+                context = rtype.gen_boxing(context)
+              end
               rtype = rtype.to_box
             elsif !rtype.boxed then
               context = rtype.gen_unboxing(context)
@@ -2323,9 +2833,14 @@ LocalVarNode
             if rtype.is_a?(RubyType::DefaultType0) then
               # Can't type inference. Dynamic method search
               mnval = @name.address
-              objclass = OpMemAddress.new(address_of("rb_obj_class"))
-              addr = address_of("ytl_method_address_of_raw")
-              meaddrof = OpMemAddress.new(addr)
+              addr = lambda {
+                address_of("rb_obj_class")
+              }
+              objclass = OpVarMemAddress.new(addr)
+              addr = lambda {
+                address_of("ytl_method_address_of_raw")
+              }
+              addrof = OpVarMemAddress.new(addr)
 
               context.start_using_reg(TMPR2)
               context.start_arg_reg
@@ -2337,7 +2852,12 @@ LocalVarNode
                 asm.call_with_arg(objclass, 1)
                 asm.mov(FUNC_ARG[0], RETR)
                 asm.mov(FUNC_ARG[1], mnval)
-                asm.call_with_arg(meaddrof, 2)
+              end
+              context.set_reg_content(FUNC_ARG[0], nil)
+              context.set_reg_content(FUNC_ARG[1], nil)
+              context = gen_save_thepr(context)
+              asm.with_retry do
+                asm.call_with_arg(addrof, 2)
                 asm.mov(TMPR2, RETR)
                 asm.pop(PTMPR)
               end
@@ -2348,8 +2868,8 @@ LocalVarNode
               context.end_arg_reg
               
               context.ret_node = self
-              context.set_reg_content(RETR, self)
-              context.set_reg_content(TMPR2, self)
+              context.set_reg_content(RETR, nil)
+              context.set_reg_content(TMPR2, nil)
               context.set_reg_content(PTMPR, @reciever)
               context.ret_reg = TMPR2
 
@@ -2409,7 +2929,7 @@ LocalVarNode
                 context.code_space.refer_operands.push context.ret_reg 
                 context.ret_node = self
               else
-                raise "Unkown method - #{@name}"
+                raise "Unkown method - #{@ruby_reciever}##{@name}"
                 context.ret_reg = OpImmidiateAddress.new(0)
                 context.ret_node = self
               end
@@ -2546,6 +3066,7 @@ LocalVarNode
           super(parent, offset, depth)
           val.parent = self
           @val = val
+          @var_from = nil
         end
 
         def traverse_childlen
@@ -2555,19 +3076,23 @@ LocalVarNode
 
         def collect_info(context)
           context = @val.collect_info(context)
-          top = @frame_info.parent
+          top = @frame_info
+          @depth.times do |i|
+            top = top.previous_frame
+          end
+          @var_from = top.parent
 
           nodepare = nil
           if @depth > 0 then 
-            nodepare = top.orig_modified_local_var[-@depth]
+            nodepare = context.modified_local_var.last[-@depth - 1]
           end
           if nodepare then
             nodepare = nodepare[@offset]
           end
           if nodepare then
-            nodepare.push [top, self]
+            nodepare.push [@var_from, self]
           else
-            nodepare = [[top, self]]
+            nodepare = [[@var_from, self]]
           end
             
           context.modified_local_var.last[-@depth - 1][@offset] = nodepare
@@ -2578,8 +3103,9 @@ LocalVarNode
         def collect_candidate_type(context)
           context = @val.collect_candidate_type(context)
           cursig = context.to_signature
-          same_type(self, @val, cursig, cursig, context)
-#          same_type(@val, self, cursig, cursig, context)
+          varcursig = context.to_signature(@var_from)
+          same_type(self, @val, varcursig, cursig, context)
+#          same_type(@val, self, cursig, varcursig, context)
           @body.collect_candidate_type(context)
         end
 
@@ -2587,11 +3113,15 @@ LocalVarNode
           context = super(context)
           context = @val.compile(context)
 
-          decide_type_once(context.to_signature)
+          sig = context.to_signature(-@depth - 1)
+          decide_type_once(sig)
+          rtype = @val.decide_type_once(context.to_signature)
           if @type.boxed then
-            @val.decide_type_once(context.to_signature)
-            rtype = @val.type
-            context = rtype.gen_boxing(context)
+            if @val.is_escape != true then
+              context = rtype.gen_boxing(context)
+            end
+          else
+            context = rtype.gen_unboxing(context)
           end
 
           valr = context.ret_reg
@@ -2631,15 +3161,21 @@ LocalVarNode
       class InstanceVarRefCommonNode<VariableRefCommonNode
         include NodeUtil
 
-        def initialize(parent, name)
+        def initialize(parent, name, mnode)
           super(parent)
           @name = name
+          @method_node = mnode
+          mname = nil
+          if @method_node then
+            mname = @method_node.get_constant_value
+          end
+          @method_name = mname
           @class_top = search_class_top
         end
       end
 
       class InstanceVarRefNode<InstanceVarRefCommonNode
-        def initialize(parent, name)
+        def initialize(parent, name, mnode)
           super
           @var_type_info = nil
         end
@@ -2661,7 +3197,7 @@ LocalVarNode
             cursig = context.to_signature
             same_type(self, src, cursig, cursig, context)
           end
-
+          
           context
         end
 
@@ -2677,8 +3213,8 @@ LocalVarNode
 
       class InstanceVarAssignNode<InstanceVarRefCommonNode
         include HaveChildlenMixin
-        def initialize(parent, name, val)
-          super(parent, name)
+        def initialize(parent, name, mnode, val)
+          super(parent, name, mnode)
           val.parent = self
           @val = val
         end
@@ -2698,12 +3234,15 @@ LocalVarNode
         end
 
         def collect_candidate_type(context)
-          @is_escape = true
-          @val.is_escape = true
           context = @val.collect_candidate_type(context)
           cursig = context.to_signature
           same_type(self, @val, cursig, cursig, context)
 #          same_type(@val, self, cursig, cursig, context)
+          rtype = @val.decide_type_once(cursig)
+          rrtype = rtype.ruby_type
+          if cursig[2].boxed and rrtype != Fixnum and rrtype != Float then
+            @val.set_escape_node_backward(true)
+          end
           @body.collect_candidate_type(context)
         end
 
@@ -2751,13 +3290,14 @@ LocalVarNode
         attr :value_node
 
         def collect_candidate_type(context)
-          if @value_node.is_a?(ClassTopNode) then
+          if @value_node.is_a?(ClassTopNode) or 
+              @value_node.is_a?(LiteralNode) then
             add_type(context.to_signature, @value_node.type)
           else
-            context = @value_node.collect_candidate_type(context)
             cursig = context.to_signature
             same_type(self, @value_node, cursig, cursig, context)
           end
+
           context
         end
 
@@ -2769,7 +3309,7 @@ LocalVarNode
             context.ret_reg  = OpVarImmidiateAddress.new(objadd)
 
           else
-            context = @value_node.compile(context)
+            context = @value_node.compile_get_constant(context)
           end
           
           context.ret_node = self
@@ -2784,19 +3324,27 @@ LocalVarNode
       class ConstantAssignNode<VariableRefCommonNode
         include NodeUtil
         include HaveChildlenMixin
+        include TypeListWithoutSignature
         
         def initialize(parent, klass, name, value)
           super(parent)
           @name = name
           @class_top = klass # .search_class_top
+          
+          pvalue = nil
           @value = value
+          @value_node = value
+          if !value.is_a?(LiteralNode) then
+            @value_node = self
+          end
 
           if klass.is_a?(ClassTopNode) then
-            klass.constant_tab[@name] = @value
+            klass.constant_tab[@name] = @value_node
           else
             pp klass.class
             raise "Not Implemented yet for set constant for dynamic class"
           end
+          @constant_area = nil
         end
 
         def traverse_childlen
@@ -2804,14 +3352,55 @@ LocalVarNode
         end
 
         def collect_candidate_type(context)
+          sig = context.to_signature
+          context = @value.collect_candidate_type(context)
+          same_type(self, @value, sig, sig, context)
           @body.collect_candidate_type(context)
         end
         
-        def type
-          @value.type
+#        def type
+#          @value.type
+#        end
+
+        def compile_get_constant(context)
+          asm = context.assembler
+          rtype = decide_type_once(context.to_signature)
+          retr = RETR
+          if rtype.ruby_type == Float and !rtype.boxed then
+            retr = XMM0
+          end
+          asm.with_retry do
+            asm.mov(TMPR, @constant_area)
+            asm.mov(retr, INDIRECT_TMPR)
+          end
+          context.ret_reg = retr
+          context.ret_node = self
+          context
         end
 
         def compile(context)
+          if !@value.is_a?(LiteralNode) then
+            asm = context.assembler
+            valproc = lambda { 4 }
+            varnilval = OpVarMemAddress.new(valproc)
+            @constant_area = asm.add_value_entry_no_cache(varnilval)
+            @constant_area = @constant_area.to_immidiate
+            context = @value.compile(context)
+            rtype = decide_type_once(context.to_signature)
+            tmpr = TMPR
+            if rtype.ruby_type == Float and !rtype.boxed then
+              tmpr = XMM0
+            end
+            
+            asm.with_retry do
+              asm.push(TMPR2)
+              asm.mov(tmpr, context.ret_reg)
+              asm.mov(TMPR2, @constant_area)
+              asm.mov(INDIRECT_TMPR2, tmpr)
+              asm.pop(TMPR2)
+            end
+          end
+
           @body.compile(context)
         end
       end