cast_off 0.3.5 → 0.3.6

data/README

@@ -212,9 +212,6 @@ cast_off [options] [programfile] [arguments]
 --run
 コンパイル済みコードを用いて、対象プログラム[programfile]を実行します。
 
---deoptimize
-脱最適化を有効にします。
-
 --clear
 プロファイル結果やコンパイル結果を削除します。
 name オプションによって foo と名づけたコンパイル結果を削除する場合、次のコマンドを使用してください。
@@ -464,7 +461,7 @@ CastOff.deoptimize(true) とすることで、脱最適化を有効にするこ
 ---指定方法
 CastOff.deoptimize(true or false)
 ---デフォルト値
-false
+true
 ---備考
 ガードでの検査に失敗した場合に、脱最適化を行う(true)か、例外を発生させる(false)かを設定します。
 脱最適化を有効にすることで、ガードでの検査失敗時にも実行を継続させることができます。

data/README.en

@@ -125,9 +125,6 @@ cast_off [options] PathOfTargetProgram ArgumentsOfTargetProgram
 --run
 Execute target program with compiled methods.
 
---deoptimize
-Enable deoptimization.
-
 --clear
 Clear profile information and delete compiled methods.
 If you want to clear profile information and compiled methods of target name "foo",

data/bin/cast_off

@@ -8,7 +8,6 @@ this = File.expand_path("#{Gem.bindir()}/#{File.basename(__FILE__)}")
 step = nil
 verbose = false
 clear = false
-deoptimize = false
 threshold = 100
 name = nil
 
@@ -22,9 +21,6 @@ opt.separator("\n  Options:")
 opt.on('--run', <<-EOS.strip) {|v| step = 'run' }
                                      Execute [programfile] with compiled codes.
 EOS
-opt.on('--deoptimize', <<-EOS.strip) {|v| deoptimize = true }
-                                     Enable deoptimization.
-EOS
 opt.on('--threshold=COUNT', <<-EOS.strip, Integer) {|v| threshold = v }
                                      Compile method which is executed more than COUNT.
                                      Default value is 100.
@@ -107,7 +103,6 @@ end
 configuration = <<-EOS
 CastOff.program_name = #{name.inspect}
 CastOff.skip_configuration_check(true)
-CastOff.deoptimize(#{deoptimize})
 CastOff.use_default_configuration()
 EOS
 eval(configuration, binding)
@@ -119,7 +114,7 @@ case step
 when nil
   STDERR.puts("-------------------------------- compilation start: threshold = #{threshold}, name = #{name}, profiling = ruby #{args} --------------------------------")
   2.times do |i|
-    system("#{this} --step-#{i + 1} --threshold=#{threshold} --name=#{name} #{deoptimize ? '--deoptimize' : ''} #{verbose ? '--verbose' : ''} #{args}")
+    system("#{this} --step-#{i + 1} --threshold=#{threshold} --name=#{name} #{verbose ? '--verbose' : ''} #{args}")
     unless $? == 0
       STDERR.puts("Failed to execute 'ruby #{args}'")
       exit
@@ -161,7 +156,7 @@ CastOff.autoload()
 Compilation finished successfully.
 You can execute #{script} with compiled codes by use of following command.
 
-$cast_off --run --name=#{name}#{deoptimize ? ' --deoptimize ' : ' '}#{args}
+$cast_off --run --name=#{name} #{args}
 ----------------------------------------------------------------------------------------
     EOS
     STDERR.puts(msg)

data/cast_off.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name		      = "cast_off"
-  spec.version		      = "0.3.5"
+  spec.version		      = "0.3.6"
   spec.platform		      = Gem::Platform::RUBY
   spec.summary		      = "Compiler for Ruby1.9.3"
   spec.description	      = <<-EOS

data/ext/cast_off/cast_off.c.rb

@@ -833,7 +833,7 @@ static VALUE cast_off_class_wrapper_each_method_search_target(VALUE self, VALUE
     st_data_t body;
 
     if (!klass) {
-      method_not_found(wrapper->klass, mid, 1);
+      break;
     }
     if (TYPE(klass) == T_ICLASS) {
       VALUE module = RBASIC(klass)->klass;

data/ext/cast_off/generated_c_include/unbox_api.h.rb

@@ -91,7 +91,7 @@ static inline VALUE MULT(long a, long b)
 %  {'VALUE' => 'RFLOAT_VALUE', 'double' => ''},
 %  {'VALUE' => 'DBL2NUM', 'double' => ''}],
 % ['float_float',
-%  {'>' => 'gt', '>=' => 'ge', '<' => 'lt', '<=' => 'le', '==' => 'eq', '==' => 'eqq'},
+%  {'>' => 'gt', '>=' => 'ge', '<' => 'lt', '<=' => 'le', '==' => 'eq', '==' => 'eqq', '!=' => 'neq'},
 %  1,
 %  :binary_operator,
 %  {'VALUE' => 'RFLOAT_VALUE', 'double' => ''},
@@ -104,6 +104,13 @@ static inline VALUE MULT(long a, long b)
 %  {'VALUE' => 'FIX2LONG', 'long' => ''},
 %  {'VALUE' => 'FIX2LONG', 'long' => ''},
 %  {'VALUE' => ''}],
+% ['fixnum_fixnum',
+%  {'>' => 'gt', '>=' => 'ge', '<' => 'lt', '<=' => 'le', '==' => 'eq', '==' => 'eqq', '!=' => 'neq'},
+%  1,
+%  :binary_operator,
+%  {'VALUE' => 'FIX2LONG', 'long' => ''},
+%  {'VALUE' => 'FIX2LONG', 'long' => ''},
+%  {'VALUE' => ''}],
 % ['fixnum_float',
 %  {'+' => 'plus', '-' => 'minus', '*' => 'mult'},
 %  1,
@@ -112,7 +119,7 @@ static inline VALUE MULT(long a, long b)
 %  {'VALUE' => 'RFLOAT_VALUE', 'double' => ''},
 %  {'VALUE' => 'DBL2NUM', 'double' => ''}],
 % ['fixnum_float',
-%  {'>' => 'gt', '>=' => 'ge', '<' => 'lt', '<=' => 'le', '==' => 'eq', '==' => 'eqq'},
+%  {'>' => 'gt', '>=' => 'ge', '<' => 'lt', '<=' => 'le', '==' => 'eq', '==' => 'eqq', '!=' => 'neq'},
 %  1,
 %  :binary_operator,
 %  {'VALUE' => '(double)FIX2LONG', 'long' => ''},
@@ -126,7 +133,7 @@ static inline VALUE MULT(long a, long b)
 %  {'VALUE' => '(double)FIX2LONG', 'long' => ''},
 %  {'VALUE' => 'DBL2NUM', 'double' => ''}],
 % ['float_fixnum',
-%  {'>' => 'gt', '>=' => 'ge', '<' => 'lt', '<=' => 'le', '==' => 'eq', '==' => 'eqq'},
+%  {'>' => 'gt', '>=' => 'ge', '<' => 'lt', '<=' => 'le', '==' => 'eq', '==' => 'eqq', '!=' => 'neq'},
 %  1,
 %  :binary_operator,
 %  {'VALUE' => 'RFLOAT_VALUE', 'double' => ''},

data/ext/cast_off/generated_c_include/vm_api.h

@@ -1,3 +1,11 @@
+static inline int empty_method_table_p(VALUE klass)
+{
+  st_table *mtbl = RCLASS_M_TBL(klass);
+
+  if (!mtbl) rb_bug("empty_method_table_p: shoult not be reached");
+  return mtbl->num_entries == 0;
+}
+
 static VALUE handle_blockarg(VALUE blockarg)
 {
   VALUE thval = rb_thread_current();

data/lib/cast_off/compile/code_manager.rb

@@ -156,7 +156,7 @@ Max length of signiture is #{FILEPATH_LIMIT} in this environment.
         @annotation_path = "#{@dstdir}/#{@signiture}.ann"
         @development_mark_file = "development"
         @development_mark_path = "#{@dstdir}/#{@development_mark_file}"
-        @dstbin = "#{@dstdir}/#{@signiture}.so"
+        @dstbin = "#{@dstdir}/#{@signiture}.#{CONFIG['DLEXT']}"
         @longpath = @base_configuration_path # FIXME
         check_length()
       end
@@ -229,8 +229,12 @@ Max length of signiture is #{FILEPATH_LIMIT} in this environment.
           log = `#{makecmd} 2>&1`
           if $? != 0
             dlog(c_source)
-            dlog(log)
-            bug("failed to compile c source: status = (#{$?})") 
+            raise(CompileError.new(<<-EOS))
+
+Failed to compile c source: status = (#{$?})
+---------- Error ----------
+#{log}
+            EOS
           else
             dlog(c_source, 2)
             dlog(log, 2)

data/lib/cast_off/compile/configuration.rb

@@ -447,7 +447,7 @@ Currently, CastOff doesn't support object, which cannot marshal dump (e.g. STDIN
     def self.load(io)
       begin
         conf = Marshal.load(io)
-      rescue NameError
+      rescue NameError, ArgumentError
         return nil
       end
       bug() unless conf.instance_of?(Configuration)
@@ -2333,7 +2333,7 @@ Currently, CastOff doesn't support object, which cannot marshal dump (e.g. STDIN
       :@@reuse_compiled_code                     => [true,  false, true],
       :@@allow_builtin_variable_incompatibility  => [false, true,  false],
       :@@prefetch_constant                       => [true,  true,  false],
-      :@@deoptimize                              => [false, true,  true],
+      :@@deoptimize                              => [true,  true,  true],
       :@@development                             => [false, true,  true],
       :@@alert_override                          => [true,  true,  false],
       :@@skip_configuration_check                => [false, false, true],

data/lib/cast_off/compile/ir/call_ir.rb

@@ -690,11 +690,7 @@ module CastOff
               ret << "  #{@return_value} = rb_reg_nth_match((int)(#{type >> 1}), rb_backref_get());"
             end
           else
-            raise(UnsupportedError.new(<<-EOS))
-
-$&, $`, $\, $+, $0...$9 are incompatible.
-If you want to use these variables, use CastOff.allow_builtin_variable_incompatibility(true).
-            EOS
+            bug()
           end
         end
         bug() unless param.empty?
@@ -1723,7 +1719,6 @@ You should not use #{@method_id} method in compilation target of CastOff.
         [MethodWrapper.new(FixnumWrapper, :>), 2]      => [['gt',           [Fixnum], nil, [TrueClass,  FalseClass], false, false]],
         [MethodWrapper.new(FixnumWrapper, :==), 2]     => [['eq',           [Fixnum], nil, [TrueClass,  FalseClass], false, false]],
         [MethodWrapper.new(FixnumWrapper, :===), 2]    => [['eqq',          [Fixnum], nil, [TrueClass,  FalseClass], false, false]],
-        [MethodWrapper.new(FixnumWrapper, :!=), 2]     => [['neq',          [Fixnum], nil, [TrueClass,  FalseClass], false, false]],
         [MethodWrapper.new(FixnumWrapper, :&), 2]      => [['and',          [Fixnum], Fixnum, nil, false, false]], # FIXME
         [MethodWrapper.new(FloatWrapper,  :+), 2]      => [['float_plus',   [Float],   nil, Float, true, true], ['fixnum_plus',   [Fixnum],  nil, Float, true, true]],
         [MethodWrapper.new(FloatWrapper,  :-), 2]      => [['float_minus',  [Float],   nil, Float, true, true], ['fixnum_minus',  [Fixnum],  nil, Float, true, true]],
@@ -1739,6 +1734,10 @@ You should not use #{@method_id} method in compilation target of CastOff.
                                                            ['fixnum_gt',    [Fixnum],  nil, [TrueClass,  FalseClass], false, true]],
         [MethodWrapper.new(FloatWrapper,  :==), 2]     => [['float_eq',     [Float],   nil, [TrueClass,  FalseClass], false, true],
                                                            ['fixnum_eq',    [Fixnum],  nil, [TrueClass,  FalseClass], false, true]],
+        [MethodWrapper.new(FixnumWrapper, :!=), 2]     => [['fixnum_neq',   [Fixnum],  nil, [TrueClass,  FalseClass], false, true],
+                                                           ['float_neq',    [Float],   nil, [TrueClass,  FalseClass], false, true]],
+        [MethodWrapper.new(FloatWrapper,  :!=), 2]     => [['float_neq',    [Float],   nil, [TrueClass,  FalseClass], false, true],
+                                                           ['fixnum_neq',   [Fixnum],  nil, [TrueClass,  FalseClass], false, true]],
         [MethodWrapper.new(FloatWrapper,  :===), 2]    => [['float_eqq',    [Float],   nil, [TrueClass,  FalseClass], false, true],
                                                            ['fixnum_eqq',   [Fixnum],  nil, [TrueClass,  FalseClass], false, true]],
         [MethodWrapper.new(FixnumWrapper, :-@), 1]     => [['uminus',       [], nil, [Fixnum, Bignum], false, true]],
@@ -2034,8 +2033,8 @@ You should not use #{@method_id} method in compilation target of CastOff.
   } else {
 %  if funcall
   <%= funcall_code(nil, id, recv, param, @argc) %>
-%  else
-    rb_bug("type mismatch: method name = <%= @method_id %>");
+%  else # empty_method_table_p に通った特異クラスがくる可能性がある。
+  <%= funcall_code(nil, id, recv, param, @argc) %>
 %  end
   }
 %end
@@ -2117,7 +2116,7 @@ You should not use #{@method_id} method in compilation target of CastOff.
               else_class = types[else_index]
               else_code = not_funcall_code(else_class, @method_id, recv, param, @argc)
               if !else_code
-                @dependency.add(else_class, @method_id, false) if else_class.method_defined?
+                @dependency.add(else_class, @method_id, false)
                 else_code = funcall_code(else_class, id, recv, param, @argc)
               end
               if nil_code == else_code

data/lib/cast_off/compile/ir/simple_ir.rb

@@ -379,6 +379,15 @@ Call site is (#{insn}).
         when :cast_off_setdvar
           irs << SubIR.new(TmpVariable.new(stack.pop()), DynamicVariable.new(*argv), insn, cfg)
         when :getspecial
+          type = insn.argv.last
+          bug() if type == 0
+          unless translator.configuration.allow_builtin_variable_incompatibility?
+            raise(UnsupportedError.new(<<-EOS))
+
+$&, $`, $\, $+, $0...$9 are incompatible.
+If you want to use these variables, use CastOff.allow_builtin_variable_incompatibility(true).
+            EOS
+          end
           param = []
           irs << Getspecial.new(param, 0, TmpVariable.new(stack.push()), insn, cfg)
         when :jump, :cast_off_enter_block, :cast_off_leave_block

data/lib/cast_off/compile/ir/sub_ir.rb

@@ -64,10 +64,10 @@ module CastOff::Compiler
         ret = []
         case @src
         when Argument
-          if @translator.inline_block?
-            # nothing to do
-          else
+          if !@translator.inline_block? && @insn.iseq.root?
             ret << "  #{@dst} = #{@src.lvar};"
+          else
+            # nothing to do
           end
         when ConstWrapper
           @insn.iseq.reference_constant

data/lib/cast_off/compile/translator.rb

@@ -101,7 +101,11 @@ static void sampling_variable(VALUE val, VALUE sym)
       klass = val;
       singleton_class_or_module_obj_p = Qtrue;
     } else {
-      klass = rb_cCastOffSingletonClass;
+      if (empty_method_table_p(klass)) {
+        klass = rb_obj_class(val);
+      } else {
+        klass = rb_cCastOffSingletonClass;
+      }
     }
   }
 
@@ -122,9 +126,17 @@ static void __sampling_poscall(VALUE val, VALUE method_klass, VALUE method_id)
 
   if (FL_TEST(method_klass, FL_SINGLETON)) {
     VALUE recv = rb_ivar_get(method_klass, rb_intern("__attached__"));
-    if ((rb_obj_class(recv) == rb_cClass || rb_obj_class(recv) == rb_cModule) && rb_class_of(recv) == method_klass) {
-      method_klass = recv;
-      class_method_or_module_function_p = Qtrue;
+    if (rb_class_of(recv) == method_klass) {
+      if ((rb_obj_class(recv) == rb_cClass || rb_obj_class(recv) == rb_cModule)) {
+        method_klass = recv;
+        class_method_or_module_function_p = Qtrue;
+      } else {
+        if (empty_method_table_p(method_klass)) {
+          method_klass = rb_obj_class(recv);
+        } else {
+          method_klass = rb_cCastOffSingletonClass;
+        }
+      }
     } else {
       method_klass = rb_cCastOffSingletonClass;
     }
@@ -153,7 +165,11 @@ static void __sampling_poscall(VALUE val, VALUE method_klass, VALUE method_id)
       klass = val;
       singleton_class_or_module_obj_p = Qtrue;
     } else {
-      klass = rb_cCastOffSingletonClass;
+      if (empty_method_table_p(klass)) {
+        klass = rb_obj_class(val);
+      } else {
+        klass = rb_cCastOffSingletonClass;
+      }
     }
   }
 
@@ -393,14 +409,6 @@ static VALUE cast_off_initialize_fptr_<%= signiture() %>(VALUE dummy)
   return Qnil;
 }
 
-static inline int empty_method_table_p(VALUE klass)
-{
-  st_table *mtbl = RCLASS_M_TBL(klass);
-
-  if (!mtbl) rb_bug("empty_method_table_p: shoult not be reached");
-  return mtbl->num_entries == 0;
-}
-
 %@throw_exception_functions.each do |(func, name)|
 <%= func.gsub(/<THROW_EXCEPTION_FUNCTION_NAME>/, name) %>
 %end
@@ -887,7 +895,8 @@ Source line is #{@root_iseq.source_line}.
 
     def allocate_function_pointer(klass, mid, convention, argc)
       bug() unless klass.is_a?(ClassWrapper)
-      fptr = "fptr_#{klass}_#{@namespace.new(mid).name}"
+      suffix = klass.singleton? ? 'singleton' : 'instance'
+      fptr = "fptr_#{klass}_#{@namespace.new(mid).name}_#{suffix}"
       fptr.gsub!(/:/, '_')
       ids = klass.to_s.split("::")
       ids.each{|k| bug() if k == ''}
@@ -1136,6 +1145,10 @@ Source line is #{@root_iseq.source_line}.
       b << InsnInfo.new([:cast_off_enter_block, loop_label], insn.iseq, -1, -1, true, prep.depth + prep.stack_usage())
       b << cont_label
       bug() unless c_depth + 1 == prep.depth + prep.stack_usage()
+      c_lvars.each_with_index do |l, index|
+        op = (index < c_iseq.args.arg_size) ? :cast_off_decl_arg : :cast_off_decl_var
+        b << InsnInfo.new([op] + l, c_iseq, -1, -1, true, c_depth)
+      end
       b << InsnInfo.new([:cast_off_cont, loop_id, c_args, insn], c_iseq, -1, -1, true, c_depth)
       if c_iseq.args.opt?
         bug() if inline_block?
@@ -1565,8 +1578,9 @@ Currently, CastOff cannot handle this constant reference.
         body.unshift(InsnInfo.new([:cast_off_fetch_args, [must, opt, rest, post, block, lvars.slice(0, @arg_size)]], @root_iseq, -1, -1, true, 0))
       end
 
+      bug() unless @root_iseq.args.arg_size == @arg_size
       decl = []
-      lvars.each_with_index do |l, index|
+      @root_iseq.lvars.each_with_index do |l, index|
         if index < @arg_size
           bug() if execute?
           op = :cast_off_decl_arg

data/lib/cast_off/compile.rb

@@ -445,8 +445,9 @@ Currently, CastOff cannot compile method which source file is not exist.
                 CastOff.compile(klass, mid, bind)
               end
               vlog("load #{klass}##{mid}")
-            rescue ArgumentError => e
-              # dependency の Marshal.load に失敗
+            rescue ArgumentError, NameError => e
+              # ArgumentError: dependency の Marshal.load に失敗
+              # NameError: prefetch constant での定数参照に失敗
               vlog("skip: entry = #{entry[0]}#{entry[2] ? '.' : '#'}#{entry[1]}, #{e}")
               CodeManager.delete_from_compiled(entry)
             rescue UnsupportedError => e
@@ -487,6 +488,16 @@ Currently, CastOff cannot compile method which source file is not exist.
         raise(ExecutionError.new("Currently, CastOff doesn't support Module#autoload"))
       end
     end
+    Kernel.module_eval do
+      def set_trace_func(*args, &p)
+        raise(ExecutionError.new("Currently, CastOff doesn't support set_trace_func"))
+      end
+    end
+    Thread.class_eval do
+      def set_trace_func(*args, &p)
+        raise(ExecutionError.new("Currently, CastOff doesn't support Thread#set_trace_func"))
+      end
+    end
 
     def contain_loop?(klass, mid)
       case compilation_target_type(klass, mid)
@@ -581,7 +592,7 @@ Currently, CastOff cannot compile method which source file is not exist.
         end
         vlog("#{index}: compile #{klass}#{singleton ? '.' : '#'}#{mid}")
         [klass, mid, singleton] + location + [Configuration::BindingWrapper.new(bind)] # klass, mid, file, line, binding
-      rescue UnsupportedError => e
+      rescue UnsupportedError, CompileError => e
         vlog("#{index}: failed to compile #{klass}#{singleton ? '.' : '#'}#{mid} (#{e.message})")
         nil
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cast_off
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-28 00:00:00.000000000 Z
+date: 2011-11-30 00:00:00.000000000 Z
 dependencies: []
 description: ! 'CastOff is a compiler for Ruby1.9.3.