rubinius-compiler 3.1 → 3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9475b19de7fdf62a0364df86c2df209defe0887
-  data.tar.gz: 7322ab0ae205811afe3d7a6777b77e3bbe4955e7
+  metadata.gz: b8f0185b47866838d791ca5875d2c2c86a92c5e9
+  data.tar.gz: cc1d20dc50c05e28554a5efd60ac10f34d2c2a65
 SHA512:
-  metadata.gz: 8c045081ecc961a40d86ae3191175d493ecf59c3eb97a9964350ee3339a599ec8fd0c29e891909a4e79b34d30d16ff76582cf7185c12320cb3df5248afd6f1fb
-  data.tar.gz: 3877f3e03865069f90ac984d5453a2564a9152657506386cd10fc5fe95d31b6d736e2164d793d691e3927ef2fc8162d8579e6b9ccbc717d785d2682938f3ac41
+  metadata.gz: 2cc1d06ee268a446f6eba05e33f59a98e44659bf8e63c31b8b00d7dd05c171cf7940b193de3333e647a7c2ea88a29df5bb7c903c5e31b38f06c170d9ed419d0d
+  data.tar.gz: 51a91af6651953519056ec02b9b8ca708907d26c10124e72cfbbebe41c97767dffa01a6abb20fd91ba212653049d78057d5a68b69956285612382563fbffd521

data/lib/rubinius/code/compiler/generator.rb

@@ -7,13 +7,13 @@ module CodeTools
     ##
     # Jump label for the branch instructions. The use scenarios for labels:
     #   1. Used and then set
-    #        g.gif label
+    #        g.goto_if_false label
     #        ...
     #        label.set!
     #   2. Set and then used
     #        label.set!
     #        ...
-    #        g.git label
+    #        g.goto_if_true label
     #   3. 1, 2
     #
     # Many labels are only used once. This class employs two small
@@ -119,63 +119,61 @@ module CodeTools
       SEPARATOR_SIZE = 40
 
       def invalid(message)
-        if $DEBUG
-          puts message
-          name = @generator.name.inspect
-          size = (SEPARATOR_SIZE - name.size - 2) / 2
-          size = 1 if size <= 0
-          puts "\n#{"=" * size} #{name} #{"=" * (size + name.size % 2)}"
-
-          literals = @generator.literals
-          names = @generator.local_names
-          stream = @generator.stream
-          i = 0
-          n = stream.size
-          stack = 0
-
-          while i < n
-            insn = Rubinius::InstructionSet[stream[i]]
-            printf "[%3d] %04d  %-28s" % [stack, i, insn.opcode.inspect]
-
-            args = stream[i+1, insn.size-1]
-            if insn.size > 1
-              insn.args.each_with_index do |kind, index|
-                arg = args[index]
-                case kind
-                when :literal
-                  printf "%s " % literals[arg].inspect
-                when :local
-                  printf "%s " % (names ? names[arg] : arg)
-                else
-                  printf "%d " % arg
-                end
+        puts message
+        name = @generator.name.inspect
+        size = (SEPARATOR_SIZE - name.size - 2) / 2
+        size = 1 if size <= 0
+        puts "\n#{"=" * size} #{name} #{"=" * (size + name.size % 2)}"
+
+        literals = @generator.literals
+        names = @generator.local_names
+        stream = @generator.stream
+        i = 0
+        n = stream.size
+        stack = 0
+
+        while i < n
+          insn = Rubinius::InstructionSet[stream[i]]
+          printf "[%3d] %04d  %-28s" % [stack, i, insn.opcode.inspect]
+
+          args = stream[i+1, insn.size-1]
+          if insn.size > 1
+            insn.args.each_with_index do |kind, index|
+              arg = args[index]
+              case kind
+              when :literal
+                printf "%s " % literals[arg].inspect
+              when :local
+                printf "%s " % (names ? names[arg] : arg)
+              else
+                printf "%d " % arg
               end
             end
+          end
 
-            puts
+          puts
 
-            if insn.variable_stack?
-              use = insn.stack_consumed
-              if use.kind_of? Array
-                use = args[use[1] - 1] + use[0]
-              end
-
-              pro = insn.stack_produced
-              if pro.kind_of? Array
-                pro = (args[pro[1] - 1] * pro[2]) + pro[0]
-              end
+          if insn.variable_stack?
+            use = insn.stack_consumed
+            if use.kind_of? Array
+              use = args[use[1] - 1] + use[0]
+            end
 
-              stack += pro - use
-            else
-              stack += insn.stack_difference
+            pro = insn.stack_produced
+            if pro.kind_of? Array
+              pro = (args[pro[1] - 1] * pro[2]) + pro[0]
             end
 
-            i += insn.size
+            stack += pro - use
+          else
+            stack += insn.stack_difference
           end
 
-          puts "-" * SEPARATOR_SIZE
+          i += insn.size
         end
 
+        puts "-" * SEPARATOR_SIZE
+
         raise CompileError, message
       end
 
@@ -447,19 +445,6 @@ module CodeTools
       Label.new(self)
     end
 
-    # Aliases
-
-    alias_method :dup,  :dup_top
-    alias_method :git,  :goto_if_true
-    alias_method :gif,  :goto_if_false
-    alias_method :gin,  :goto_if_nil
-    alias_method :ginn, :goto_if_not_nil
-    alias_method :giu,  :goto_if_undefined
-    alias_method :ginu, :goto_if_not_undefined
-    alias_method :gie,  :goto_if_equal
-    alias_method :gine, :goto_if_not_equal
-    alias_method :swap, :swap_stack
-
     # Helpers
 
     def new_basic_block
@@ -482,82 +467,27 @@ module CodeTools
       return idx
     end
 
-    def push(what)
-      case what
-      when :true
-        push_true
-      when :false
-        push_false
-      when :self
-        push_self
-      when :nil
-        push_nil
-      when Integer
-        push_int what
-      else
-        raise CompileError, "Unknown push argument '#{what.inspect}'"
-      end
+    def push_generator(generator)
+      index = @literals.size
+      push_literal generator
+      @generators << index
+      index
     end
 
-    def push_generator(generator)
-      index = push_literal generator
+    def add_generator(generator)
+      index = add_literal generator
       @generators << index
       index
     end
 
-    # Find the index for the specified literal, or create a new slot if the
-    # literal has not been encountered previously.
     def find_literal(literal)
       @literals_map[literal]
     end
 
-    # Add literal exists to allow RegexLiteral's to create a new regex literal
-    # object at run-time. All other literals should be added via find_literal,
-    # which re-use an existing matching literal if one exists.
     def add_literal(literal)
       index = @literals.size
       @literals << literal
-      return index
-    end
-
-    # Pushes the specified literal value into the literal's tuple
-    def push_literal(literal)
-      index = find_literal literal
-      emit_push_literal index
-      return index
-    end
-
-    # Puts +what+ is the literals tuple without trying to see if
-    # something that is like +what+ is already there.
-    def push_unique_literal(literal)
-      index = add_literal literal
-      emit_push_literal index
-      return index
-    end
-
-    # Pushes the literal value on the stack into the specified position in the
-    # literals tuple. Most timees, push_literal should be used instead; this
-    # method exists to support RegexLiteral, where the compiled literal value
-    # (a Regex object) does not exist until runtime.
-    def push_literal_at(index)
-      emit_push_literal index
-      return index
-    end
-
-    # The push_const instruction itself is unused right now. The instruction
-    # parser does not emit a GeneratorMethods#push_const. This method/opcode
-    # was used in the compiler before the push_const_fast instruction. Rather
-    # than changing the compiler code, this helper was used.
-    def push_const(name)
-      push_const_fast find_literal(name)
-    end
-
-    # The find_const instruction itself is unused right now. The instruction
-    # parser does not emit a GeneratorMethods#find_const. This method/opcode
-    # was used in the compiler before the find_const_fast instruction. Rather
-    # than changing the compiler code, this helper was used.
-    def find_const(name)
-      find_const_fast find_literal(name)
+      index
     end
 
     def push_local(idx)
@@ -601,18 +531,11 @@ module CodeTools
         raise CompileError, "count must be a number"
       end
 
-      idx = find_literal(meth)
-
-      # Don't use send_method, it's only for when the syntax
-      # specified no arguments and no parens.
-      send_stack idx, count
-    end
-
-    # Do a private send to self with no arguments specified, ie, a vcall
-    # style send.
-    def send_vcall(meth)
-      idx = find_literal(meth)
-      send_method idx
+      if count == 0
+        send_method meth
+      else
+        send_stack meth, count
+      end
     end
 
     def send_with_block(meth, count, priv=false)
@@ -622,9 +545,7 @@ module CodeTools
         raise CompileError, "count must be a number"
       end
 
-      idx = find_literal(meth)
-
-      send_stack_with_block idx, count
+      send_stack_with_block meth, count
     end
 
     def send_with_splat(meth, args, priv=false, concat=false)
@@ -634,23 +555,15 @@ module CodeTools
 
       allow_private if priv
 
-      idx = find_literal(meth)
-      send_stack_with_splat idx, args
+      send_stack_with_splat meth, args
     end
 
     def send_super(meth, args, splat=false)
-      idx = find_literal(meth)
-
       if splat
-        send_super_stack_with_splat idx, args
+        send_super_stack_with_splat meth, args
       else
-        send_super_stack_with_block idx, args
+        send_super_stack_with_block meth, args
       end
     end
-
-    def meta_to_s(name=:to_s, priv=true)
-      allow_private if priv
-      super find_literal(name)
-    end
   end
 end

data/lib/rubinius/code/compiler/generator_methods.rb

@@ -31,25 +31,10 @@ module CodeTools
       end
 
       def push_int(arg1)
-        if arg1 > 2 and arg1 < 256
-          @stream << 4 << arg1
-          @current_block.add_stack(0, 1)
-          @ip += 2
-          @instruction = 4
-        else
-          case arg1
-          when -1
-            meta_push_neg_1
-          when 0
-            meta_push_0
-          when 1
-            meta_push_1
-          when 2
-            meta_push_2
-          else
-            push_literal arg1
-          end
-        end
+        @stream << 4 << arg1
+        @ip += 2
+        @current_block.add_stack(0, 1)
+        @instruction = 4
       end
 
       def push_self
@@ -59,14 +44,16 @@ module CodeTools
         @instruction = 5
       end
 
-      def set_literal(arg1)
+      def push_memo(arg1)
+        arg1 = find_literal(arg1)
         @stream << 6 << arg1
         @ip += 2
         @current_block.add_stack(1, 1)
         @instruction = 6
       end
 
-      def emit_push_literal(arg1)
+      def push_literal(arg1)
+        arg1 = find_literal(arg1)
         @stream << 7 << arg1
         @ip += 2
         @current_block.add_stack(0, 1)
@@ -206,14 +193,14 @@ module CodeTools
         @instruction = 17
       end
 
-      def swap_stack
+      def swap
         @stream << 18
         @ip += 1
         @current_block.add_stack(2, 2)
         @instruction = 18
       end
 
-      def dup_top
+      def dup
         @stream << 19
         @ip += 1
         @current_block.add_stack(1, 2)
@@ -221,6 +208,7 @@ module CodeTools
       end
 
       def dup_many(arg1)
+        arg1 = Integer(arg1)
         @stream << 20 << arg1
         @ip += 2
         @current_block.add_stack(arg1, (arg1 * 2))
@@ -235,6 +223,7 @@ module CodeTools
       end
 
       def pop_many(arg1)
+        arg1 = Integer(arg1)
         @stream << 22 << arg1
         @ip += 2
         @current_block.add_stack(arg1, 0)
@@ -242,6 +231,7 @@ module CodeTools
       end
 
       def rotate(arg1)
+        arg1 = Integer(arg1)
         @stream << 23 << arg1
         @ip += 2
         @current_block.add_stack(arg1, (arg1 * 1))
@@ -385,6 +375,7 @@ module CodeTools
       end
 
       def make_array(arg1)
+        arg1 = Integer(arg1)
         @stream << 41 << arg1
         @ip += 2
         @current_block.add_stack(arg1, 1)
@@ -407,7 +398,7 @@ module CodeTools
       end
 
       def set_ivar(arg1)
-        arg1 = find_literal arg1
+        arg1 = find_literal(arg1)
         @stream << 44 << arg1
         @ip += 2
         @current_block.add_stack(1, 1)
@@ -415,7 +406,7 @@ module CodeTools
       end
 
       def push_ivar(arg1)
-        arg1 = find_literal arg1
+        arg1 = find_literal(arg1)
         @stream << 45 << arg1
         @ip += 2
         @current_block.add_stack(0, 1)
@@ -423,463 +414,387 @@ module CodeTools
       end
 
       def set_const(arg1)
-        @stream << 47 << arg1
+        arg1 = find_literal(arg1)
+        @stream << 46 << arg1
         @ip += 2
         @current_block.add_stack(1, 1)
-        @instruction = 47
+        @instruction = 46
       end
 
       def set_const_at(arg1)
-        @stream << 48 << arg1
+        arg1 = find_literal(arg1)
+        @stream << 47 << arg1
         @ip += 2
         @current_block.add_stack(2, 1)
-        @instruction = 48
-      end
-
-      def find_const(arg1)
-        arg1 = find_literal arg1
-        @stream << 49 << arg1
-        @ip += 2
-        @current_block.add_stack(1, 1)
-        @instruction = 49
+        @instruction = 47
       end
 
       def push_cpath_top
-        @stream << 50
+        @stream << 48
         @ip += 1
         @current_block.add_stack(0, 1)
-        @instruction = 50
+        @instruction = 48
       end
 
-      def push_const_fast(arg1)
-        @stream << 51 << arg1
+      def push_const(arg1)
+        arg1 = find_literal(arg1)
+        @stream << 49 << arg1
         @ip += 2
         @current_block.add_stack(0, 1)
-        @instruction = 51
+        @instruction = 49
       end
 
-      def find_const_fast(arg1)
-        @stream << 52 << arg1
+      def find_const(arg1)
+        arg1 = find_literal(arg1)
+        @stream << 50 << arg1
         @ip += 2
         @current_block.add_stack(1, 1)
-        @instruction = 52
+        @instruction = 50
       end
 
       def set_call_flags(arg1)
-        @stream << 53 << arg1
+        @stream << 51 << arg1
         @ip += 2
         @current_block.add_stack(0, 0)
-        @instruction = 53
+        @instruction = 51
       end
 
       def allow_private
-        @stream << 54
+        @stream << 52
         @ip += 1
         @current_block.add_stack(0, 0)
-        @instruction = 54
+        @instruction = 52
+      end
+
+      def send_vcall(arg1)
+        arg1 = find_literal(arg1)
+        @stream << 53 << arg1
+        @ip += 2
+        @current_block.add_stack(0, 1)
+        @instruction = 53
       end
 
       def send_method(arg1)
-        @stream << 55 << arg1
+        arg1 = find_literal(arg1)
+        @stream << 54 << arg1
         @ip += 2
         @current_block.add_stack(1, 1)
-        @instruction = 55
+        @instruction = 54
       end
 
       def send_stack(arg1, arg2)
-        @stream << 56 << arg1 << arg2
+        arg1 = find_literal(arg1)
+        arg2 = Integer(arg2)
+        @stream << 55 << arg1 << arg2
         @ip += 3
         @current_block.add_stack(arg2+1, 1)
-        @instruction = 56
+        @instruction = 55
       end
 
       def send_stack_with_block(arg1, arg2)
-        @stream << 57 << arg1 << arg2
+        arg1 = find_literal(arg1)
+        arg2 = Integer(arg2)
+        @stream << 56 << arg1 << arg2
         @ip += 3
         @current_block.add_stack(arg2+2, 1)
-        @instruction = 57
+        @instruction = 56
       end
 
       def send_stack_with_splat(arg1, arg2)
-        @stream << 58 << arg1 << arg2
+        arg1 = find_literal(arg1)
+        arg2 = Integer(arg2)
+        @stream << 57 << arg1 << arg2
         @ip += 3
         @current_block.add_stack(arg2+3, 1)
-        @instruction = 58
+        @instruction = 57
       end
 
       def send_super_stack_with_block(arg1, arg2)
-        @stream << 59 << arg1 << arg2
+        arg1 = find_literal(arg1)
+        arg2 = Integer(arg2)
+        @stream << 58 << arg1 << arg2
         @ip += 3
         @current_block.add_stack(arg2+1, 1)
-        @instruction = 59
+        @instruction = 58
       end
 
       def send_super_stack_with_splat(arg1, arg2)
-        @stream << 60 << arg1 << arg2
+        arg1 = find_literal(arg1)
+        arg2 = Integer(arg2)
+        @stream << 59 << arg1 << arg2
         @ip += 3
         @current_block.add_stack(arg2+2, 1)
-        @instruction = 60
+        @instruction = 59
       end
 
       def push_block
-        @stream << 61
+        @stream << 60
         @ip += 1
         @current_block.add_stack(0, 1)
-        @instruction = 61
+        @instruction = 60
       end
 
       def passed_blockarg(arg1)
-        @stream << 62 << arg1
+        arg1 = Integer(arg1)
+        @stream << 61 << arg1
         @ip += 2
         @current_block.add_stack(0, 1)
-        @instruction = 62
+        @instruction = 61
       end
 
       def create_block(arg1)
-        arg1 = add_literal arg1
-        @generators << arg1
-        @stream << 63 << arg1
+        arg1 = add_generator(arg1)
+        @stream << 62 << arg1
         @ip += 2
         @current_block.add_stack(0, 1)
-        @instruction = 63
+        @instruction = 62
       end
 
       def cast_for_single_block_arg
-        @stream << 64
+        @stream << 63
         @ip += 1
         @current_block.add_stack(0, 1)
-        @instruction = 64
+        @instruction = 63
       end
 
       def cast_for_multi_block_arg
-        @stream << 65
+        @stream << 64
         @ip += 1
         @current_block.add_stack(0, 1)
-        @instruction = 65
+        @instruction = 64
       end
 
       def cast_for_splat_block_arg
-        @stream << 66
+        @stream << 65
         @ip += 1
         @current_block.add_stack(0, 1)
-        @instruction = 66
+        @instruction = 65
       end
 
       def yield_stack(arg1)
-        @stream << 67 << arg1
+        arg1 = Integer(arg1)
+        @stream << 66 << arg1
         @ip += 2
         @current_block.add_stack(arg1, 1)
-        @instruction = 67
+        @instruction = 66
       end
 
       def yield_splat(arg1)
-        @stream << 68 << arg1
+        arg1 = Integer(arg1)
+        @stream << 67 << arg1
         @ip += 2
         @current_block.add_stack(arg1+1, 1)
-        @instruction = 68
+        @instruction = 67
       end
 
       def string_append
-        @stream << 69
+        @stream << 68
         @ip += 1
         @current_block.add_stack(2, 1)
-        @instruction = 69
+        @instruction = 68
       end
 
       def string_build(arg1)
-        @stream << 70 << arg1
+        arg1 = Integer(arg1)
+        @stream << 69 << arg1
         @ip += 2
         @current_block.add_stack(arg1, 1)
-        @instruction = 70
+        @instruction = 69
       end
 
       def string_dup
-        @stream << 71
+        @stream << 70
         @ip += 1
         @current_block.add_stack(1, 1)
-        @instruction = 71
+        @instruction = 70
       end
 
       def push_scope
-        @stream << 72
+        @stream << 71
         @ip += 1
         @current_block.add_stack(0, 1)
-        @instruction = 72
+        @instruction = 71
       end
 
       def add_scope
-        @stream << 73
+        @stream << 72
         @ip += 1
         @current_block.add_stack(1, 0)
-        @instruction = 73
+        @instruction = 72
       end
 
       def push_variables
-        @stream << 74
+        @stream << 73
         @ip += 1
         @current_block.add_stack(0, 1)
-        @instruction = 74
+        @instruction = 73
       end
 
       def check_interrupts
-        @stream << 75
+        @stream << 74
         @ip += 1
         @current_block.add_stack(0, 0)
-        @instruction = 75
+        @instruction = 74
       end
 
       def yield_debugger
-        @stream << 76
+        @stream << 75
         @ip += 1
         @current_block.add_stack(0, 0)
-        @instruction = 76
-      end
-
-      def is_nil
-        @stream << 77
-        @ip += 1
-        @current_block.add_stack(1, 1)
-        @instruction = 77
+        @instruction = 75
       end
 
       def check_serial(arg1, arg2)
-        arg1 = find_literal arg1
-        arg2 = Integer(arg2)
-        @stream << 78 << arg1 << arg2
+        arg1 = find_literal(arg1)
+        @stream << 76 << arg1 << arg2
         @ip += 3
         @current_block.add_stack(1, 1)
-        @instruction = 78
+        @instruction = 76
       end
 
       def check_serial_private(arg1, arg2)
-        arg1 = find_literal arg1
-        arg2 = Integer(arg2)
-        @stream << 79 << arg1 << arg2
+        arg1 = find_literal(arg1)
+        @stream << 77 << arg1 << arg2
         @ip += 3
         @current_block.add_stack(1, 1)
-        @instruction = 79
+        @instruction = 77
       end
 
       def push_my_field(arg1)
-        @stream << 80 << arg1
+        @stream << 78 << arg1
         @ip += 2
         @current_block.add_stack(0, 1)
-        @instruction = 80
+        @instruction = 78
       end
 
       def store_my_field(arg1)
-        @stream << 81 << arg1
+        @stream << 79 << arg1
         @ip += 2
         @current_block.add_stack(1, 1)
-        @instruction = 81
+        @instruction = 79
       end
 
       def kind_of
-        @stream << 82
+        @stream << 80
         @ip += 1
         @current_block.add_stack(2, 1)
-        @instruction = 82
+        @instruction = 80
       end
 
       def instance_of
-        @stream << 83
+        @stream << 81
         @ip += 1
         @current_block.add_stack(2, 1)
-        @instruction = 83
-      end
-
-      def meta_push_neg_1
-        @stream << 84
-        @ip += 1
-        @current_block.add_stack(0, 1)
-        @instruction = 84
-      end
-
-      def meta_push_0
-        @stream << 85
-        @ip += 1
-        @current_block.add_stack(0, 1)
-        @instruction = 85
-      end
-
-      def meta_push_1
-        @stream << 86
-        @ip += 1
-        @current_block.add_stack(0, 1)
-        @instruction = 86
-      end
-
-      def meta_push_2
-        @stream << 87
-        @ip += 1
-        @current_block.add_stack(0, 1)
-        @instruction = 87
-      end
-
-      def meta_send_op_plus(arg1)
-        @stream << 88 << arg1
-        @ip += 2
-        @current_block.add_stack(2, 1)
-        @instruction = 88
-      end
-
-      def meta_send_op_minus(arg1)
-        @stream << 89 << arg1
-        @ip += 2
-        @current_block.add_stack(2, 1)
-        @instruction = 89
-      end
-
-      def meta_send_op_equal(arg1)
-        @stream << 90 << arg1
-        @ip += 2
-        @current_block.add_stack(2, 1)
-        @instruction = 90
-      end
-
-      def meta_send_op_lt(arg1)
-        @stream << 91 << arg1
-        @ip += 2
-        @current_block.add_stack(2, 1)
-        @instruction = 91
-      end
-
-      def meta_send_op_gt(arg1)
-        @stream << 92 << arg1
-        @ip += 2
-        @current_block.add_stack(2, 1)
-        @instruction = 92
-      end
-
-      def meta_send_op_tequal(arg1)
-        @stream << 93 << arg1
-        @ip += 2
-        @current_block.add_stack(2, 1)
-        @instruction = 93
-      end
-
-      def meta_send_call(arg1, arg2)
-        @stream << 94 << arg1 << arg2
-        @ip += 3
-        @current_block.add_stack(arg2+1, 1)
-        @instruction = 94
+        @instruction = 81
       end
 
       def push_my_offset(arg1)
-        @stream << 95 << arg1
+        @stream << 82 << arg1
         @ip += 2
         @current_block.add_stack(0, 1)
-        @instruction = 95
+        @instruction = 82
       end
 
       def zsuper(arg1)
-        arg1 = find_literal arg1
-        @stream << 96 << arg1
+        arg1 = find_literal(arg1)
+        @stream << 83 << arg1
         @ip += 2
         @current_block.add_stack(1, 1)
-        @instruction = 96
+        @instruction = 83
       end
 
       def push_block_arg
-        @stream << 97
+        @stream << 84
         @ip += 1
         @current_block.add_stack(0, 1)
-        @instruction = 97
+        @instruction = 84
       end
 
       def push_undef
-        @stream << 98
+        @stream << 85
         @ip += 1
         @current_block.add_stack(0, 1)
-        @instruction = 98
+        @instruction = 85
       end
 
       def push_stack_local(arg1)
-        @stream << 99 << arg1
+        @stream << 86 << arg1
         @ip += 2
         @current_block.add_stack(0, 1)
-        @instruction = 99
+        @instruction = 86
       end
 
       def set_stack_local(arg1)
-        @stream << 100 << arg1
+        @stream << 87 << arg1
         @ip += 2
         @current_block.add_stack(1, 1)
-        @instruction = 100
+        @instruction = 87
       end
 
       def push_has_block
-        @stream << 101
+        @stream << 88
         @ip += 1
         @current_block.add_stack(0, 1)
-        @instruction = 101
+        @instruction = 88
       end
 
       def push_proc
-        @stream << 102
+        @stream << 89
         @ip += 1
         @current_block.add_stack(0, 1)
-        @instruction = 102
+        @instruction = 89
       end
 
       def check_frozen
-        @stream << 103
+        @stream << 90
         @ip += 1
         @current_block.add_stack(1, 1)
-        @instruction = 103
+        @instruction = 90
       end
 
       def cast_multi_value
-        @stream << 104
+        @stream << 91
         @ip += 1
         @current_block.add_stack(1, 1)
-        @instruction = 104
+        @instruction = 91
       end
 
       def invoke_primitive(arg1, arg2)
-        arg1 = find_literal arg1
+        arg1 = find_literal(arg1)
         arg2 = Integer(arg2)
-        @stream << 105 << arg1 << arg2
+        @stream << 92 << arg1 << arg2
         @ip += 3
         @current_block.add_stack(arg2, 1)
-        @instruction = 105
+        @instruction = 92
       end
 
       def push_rubinius
-        @stream << 106
+        @stream << 93
         @ip += 1
         @current_block.add_stack(0, 1)
-        @instruction = 106
-      end
-
-      def call_custom(arg1, arg2)
-        arg1 = find_literal arg1
-        arg2 = Integer(arg2)
-        @stream << 107 << arg1 << arg2
-        @ip += 3
-        @current_block.add_stack(arg2+1, 1)
-        @instruction = 107
+        @instruction = 93
       end
 
-      def meta_to_s(arg1)
-        @stream << 108 << arg1
+      def object_to_s(arg1)
+        arg1 = find_literal(arg1)
+        @stream << 94 << arg1
         @ip += 2
         @current_block.add_stack(1, 1)
-        @instruction = 108
+        @instruction = 94
       end
 
       def push_type
-        @stream << 109
+        @stream << 95
         @ip += 1
         @current_block.add_stack(0, 1)
-        @instruction = 109
+        @instruction = 95
       end
 
       def push_mirror
-        @stream << 110
+        @stream << 96
         @ip += 1
         @current_block.add_stack(0, 1)
-        @instruction = 110
+        @instruction = 96
       end
 
   end

data/lib/rubinius/code/compiler/opcodes.rb

@@ -12,7 +12,7 @@ module Rubinius
     opcode  5, :push_self,                   :stack => [0, 1],     :args => [],                               :control_flow => :next
 
     # Manipulate literals
-    opcode  6, :set_literal,                 :stack => [1, 1],     :args => [:literal],                       :control_flow => :next
+    opcode  6, :push_memo,                   :stack => [1, 1],     :args => [:literal],                       :control_flow => :next
     opcode  7, :push_literal,                :stack => [0, 1],     :args => [:literal],                       :control_flow => :next
 
     # Flow control
@@ -28,8 +28,8 @@ module Rubinius
     opcode 17, :ret,                         :stack => [1, 1],     :args => [],                               :control_flow => :return
 
     # Stack manipulations
-    opcode 18, :swap_stack,                  :stack => [2, 2],     :args => [],                               :control_flow => :next
-    opcode 19, :dup_top,                     :stack => [1, 2],     :args => [],                               :control_flow => :next
+    opcode 18, :swap,                        :stack => [2, 2],     :args => [],                               :control_flow => :next
+    opcode 19, :dup,                         :stack => [1, 2],     :args => [],                               :control_flow => :next
     opcode 20, :dup_many,                    :stack => [[0,1], [0, 1, 2]],:args => [:count],                         :control_flow => :next
     opcode 21, :pop,                         :stack => [1, 0],     :args => [],                               :control_flow => :next
     opcode 22, :pop_many,                    :stack => [[0,1], 0], :args => [:count],                         :control_flow => :next
@@ -66,91 +66,73 @@ module Rubinius
     opcode 45, :push_ivar,                   :stack => [0, 1],     :args => [:literal],                       :control_flow => :next
 
     # Manipulate constants
-    opcode 46, :push_const,                  :stack => [0, 1],     :args => [:literal],                       :control_flow => :next
-    opcode 47, :set_const,                   :stack => [1, 1],     :args => [:literal],                       :control_flow => :next
-    opcode 48, :set_const_at,                :stack => [2, 1],     :args => [:literal],                       :control_flow => :next
-    opcode 49, :find_const,                  :stack => [1, 1],     :args => [:literal],                       :control_flow => :next
-    opcode 50, :push_cpath_top,              :stack => [0, 1],     :args => [],                               :control_flow => :next
-    opcode 51, :push_const_fast,             :stack => [0, 1],     :args => [:literal],                       :control_flow => :next
-    opcode 52, :find_const_fast,             :stack => [1, 1],     :args => [:literal],                       :control_flow => :next
+    opcode 46, :set_const,                   :stack => [1, 1],     :args => [:literal],                       :control_flow => :next
+    opcode 47, :set_const_at,                :stack => [2, 1],     :args => [:literal],                       :control_flow => :next
+    opcode 48, :push_cpath_top,              :stack => [0, 1],     :args => [],                               :control_flow => :next
+    opcode 49, :push_const,                  :stack => [0, 1],     :args => [:literal],                       :control_flow => :next
+    opcode 50, :find_const,                  :stack => [1, 1],     :args => [:literal],                       :control_flow => :next
 
     # Send messages
-    opcode 53, :set_call_flags,              :stack => [0, 0],     :args => [:flags],                         :control_flow => :next
-    opcode 54, :allow_private,               :stack => [0, 0],     :args => [],                               :control_flow => :next
-    opcode 55, :send_method,                 :stack => [1, 1],     :args => [:literal],                       :control_flow => :send
-    opcode 56, :send_stack,                  :stack => [[1,2], 1], :args => [:literal, :count],               :control_flow => :send
-    opcode 57, :send_stack_with_block,       :stack => [[2,2], 1], :args => [:literal, :count],               :control_flow => :send
+    opcode 51, :set_call_flags,              :stack => [0, 0],     :args => [:flags],                         :control_flow => :next
+    opcode 52, :allow_private,               :stack => [0, 0],     :args => [],                               :control_flow => :next
+    opcode 53, :send_vcall,                  :stack => [0, 1],     :args => [:literal],                       :control_flow => :send
+    opcode 54, :send_method,                 :stack => [1, 1],     :args => [:literal],                       :control_flow => :send
+    opcode 55, :send_stack,                  :stack => [[1,2], 1], :args => [:literal, :count],               :control_flow => :send
+    opcode 56, :send_stack_with_block,       :stack => [[2,2], 1], :args => [:literal, :count],               :control_flow => :send
 
     CALL_FLAG_CONCAT = 2
 
-    opcode 58, :send_stack_with_splat,       :stack => [[3,2], 1], :args => [:literal, :count],               :control_flow => :send
-    opcode 59, :send_super_stack_with_block, :stack => [[1,2], 1], :args => [:literal, :count],               :control_flow => :send
-    opcode 60, :send_super_stack_with_splat, :stack => [[2,2], 1], :args => [:literal, :count],               :control_flow => :send
+    opcode 57, :send_stack_with_splat,       :stack => [[3,2], 1], :args => [:literal, :count],               :control_flow => :send
+    opcode 58, :send_super_stack_with_block, :stack => [[1,2], 1], :args => [:literal, :count],               :control_flow => :send
+    opcode 59, :send_super_stack_with_splat, :stack => [[2,2], 1], :args => [:literal, :count],               :control_flow => :send
 
     # Manipulate blocks
-    opcode 61, :push_block,                  :stack => [0, 1],     :args => [],                               :control_flow => :next
-    opcode 62, :passed_blockarg,             :stack => [0, 1],     :args => [:count],                         :control_flow => :next
-    opcode 63, :create_block,                :stack => [0, 1],     :args => [:literal],                       :control_flow => :next
-    opcode 64, :cast_for_single_block_arg,   :stack => [0, 1],     :args => [],                               :control_flow => :next
-    opcode 65, :cast_for_multi_block_arg,    :stack => [0, 1],     :args => [],                               :control_flow => :next
-    opcode 66, :cast_for_splat_block_arg,    :stack => [0, 1],     :args => [],                               :control_flow => :next
-    opcode 67, :yield_stack,                 :stack => [[0,1], 1], :args => [:count],                         :control_flow => :yield
-    opcode 68, :yield_splat,                 :stack => [[1,1], 1], :args => [:count],                         :control_flow => :yield
+    opcode 60, :push_block,                  :stack => [0, 1],     :args => [],                               :control_flow => :next
+    opcode 61, :passed_blockarg,             :stack => [0, 1],     :args => [:count],                         :control_flow => :next
+    opcode 62, :create_block,                :stack => [0, 1],     :args => [:literal],                       :control_flow => :next
+    opcode 63, :cast_for_single_block_arg,   :stack => [0, 1],     :args => [],                               :control_flow => :next
+    opcode 64, :cast_for_multi_block_arg,    :stack => [0, 1],     :args => [],                               :control_flow => :next
+    opcode 65, :cast_for_splat_block_arg,    :stack => [0, 1],     :args => [],                               :control_flow => :next
+    opcode 66, :yield_stack,                 :stack => [[0,1], 1], :args => [:count],                         :control_flow => :yield
+    opcode 67, :yield_splat,                 :stack => [[1,1], 1], :args => [:count],                         :control_flow => :yield
 
     # Manipulate strings
-    opcode 69, :string_append,               :stack => [2, 1],     :args => [],                               :control_flow => :next
-    opcode 70, :string_build,                :stack => [[0,1], 1], :args => [:count],                         :control_flow => :next
-    opcode 71, :string_dup,                  :stack => [1, 1],     :args => [],                               :control_flow => :next
+    opcode 68, :string_append,               :stack => [2, 1],     :args => [],                               :control_flow => :next
+    opcode 69, :string_build,                :stack => [[0,1], 1], :args => [:count],                         :control_flow => :next
+    opcode 70, :string_dup,                  :stack => [1, 1],     :args => [],                               :control_flow => :next
 
     # Manipulate scope
-    opcode 72, :push_scope,                  :stack => [0, 1],     :args => [],                               :control_flow => :next
-    opcode 73, :add_scope,                   :stack => [1, 0],     :args => [],                               :control_flow => :next
-    opcode 74, :push_variables,              :stack => [0, 1],     :args => [],                               :control_flow => :next
+    opcode 71, :push_scope,                  :stack => [0, 1],     :args => [],                               :control_flow => :next
+    opcode 72, :add_scope,                   :stack => [1, 0],     :args => [],                               :control_flow => :next
+    opcode 73, :push_variables,              :stack => [0, 1],     :args => [],                               :control_flow => :next
 
     # Miscellaneous. TODO: better categorize these
-    opcode 75, :check_interrupts,            :stack => [0, 0],     :args => [],                               :control_flow => :next
-    opcode 76, :yield_debugger,              :stack => [0, 0],     :args => [],                               :control_flow => :next
-    opcode 77, :is_nil,                      :stack => [1, 1],     :args => [],                               :control_flow => :next
-    opcode 78, :check_serial,                :stack => [1, 1],     :args => [:literal, :serial],              :control_flow => :next
-    opcode 79, :check_serial_private,        :stack => [1, 1],     :args => [:literal, :serial],              :control_flow => :next
+    opcode 74, :check_interrupts,            :stack => [0, 0],     :args => [],                               :control_flow => :next
+    opcode 75, :yield_debugger,              :stack => [0, 0],     :args => [],                               :control_flow => :next
+    opcode 76, :check_serial,                :stack => [1, 1],     :args => [:literal, :serial],              :control_flow => :next
+    opcode 77, :check_serial_private,        :stack => [1, 1],     :args => [:literal, :serial],              :control_flow => :next
 
     # Access object fields
-    opcode 80, :push_my_field,               :stack => [0, 1],     :args => [:index],                         :control_flow => :next
-    opcode 81, :store_my_field,              :stack => [1, 1],     :args => [:index],                         :control_flow => :next
+    opcode 78, :push_my_field,               :stack => [0, 1],     :args => [:index],                         :control_flow => :next
+    opcode 79, :store_my_field,              :stack => [1, 1],     :args => [:index],                         :control_flow => :next
 
     # Type checks
-    opcode 82, :kind_of,                     :stack => [2, 1],     :args => [],                               :control_flow => :next
-    opcode 83, :instance_of,                 :stack => [2, 1],     :args => [],                               :control_flow => :next
-
-    # Optimizations
-    opcode 84, :meta_push_neg_1,             :stack => [0, 1],     :args => [],                               :control_flow => :next
-    opcode 85, :meta_push_0,                 :stack => [0, 1],     :args => [],                               :control_flow => :next
-    opcode 86, :meta_push_1,                 :stack => [0, 1],     :args => [],                               :control_flow => :next
-    opcode 87, :meta_push_2,                 :stack => [0, 1],     :args => [],                               :control_flow => :next
-    opcode 88, :meta_send_op_plus,           :stack => [2, 1],     :args => [:literal],                       :control_flow => :send
-    opcode 89, :meta_send_op_minus,          :stack => [2, 1],     :args => [:literal],                       :control_flow => :send
-    opcode 90, :meta_send_op_equal,          :stack => [2, 1],     :args => [:literal],                       :control_flow => :send
-    opcode 91, :meta_send_op_lt,             :stack => [2, 1],     :args => [:literal],                       :control_flow => :next
-    opcode 92, :meta_send_op_gt,             :stack => [2, 1],     :args => [:literal],                       :control_flow => :next
-    opcode 93, :meta_send_op_tequal,         :stack => [2, 1],     :args => [:literal],                       :control_flow => :send
-    opcode 94, :meta_send_call,              :stack => [[1,2], 1], :args => [:literal, :count],               :control_flow => :send
-
-    # More misc
-    opcode 95, :push_my_offset,              :stack => [0, 1],     :args => [:index],                         :control_flow => :next
-    opcode 96, :zsuper,                      :stack => [1, 1],     :args => [:literal],                       :control_flow => :next
-    opcode 97, :push_block_arg,              :stack => [0, 1],     :args => [],                               :control_flow => :next
-    opcode 98, :push_undef,                  :stack => [0, 1],     :args => [],                               :control_flow => :next
-    opcode 99, :push_stack_local,            :stack => [0, 1],     :args => [:which],                         :control_flow => :next
-    opcode 100, :set_stack_local,             :stack => [1, 1],     :args => [:which],                         :control_flow => :next
-    opcode 101, :push_has_block,              :stack => [0, 1],     :args => [],                               :control_flow => :next
-    opcode 102, :push_proc,                   :stack => [0, 1],     :args => [],                               :control_flow => :next
-    opcode 103, :check_frozen,                :stack => [1, 1],     :args => [],                               :control_flow => :next
-    opcode 104, :cast_multi_value,            :stack => [1, 1],     :args => [],                               :control_flow => :next
-    opcode 105, :invoke_primitive,            :stack => [[0,2], 1], :args => [:literal, :count],               :control_flow => :next
-    opcode 106, :push_rubinius,               :stack => [0, 1],     :args => [],                               :control_flow => :next
-    opcode 107, :call_custom,                 :stack => [[1,2], 1], :args => [:literal, :count],               :control_flow => :send
-    opcode 108, :meta_to_s,                   :stack => [1, 1],     :args => [:literal],                       :control_flow => :send
-    opcode 109, :push_type,                   :stack => [0, 1],     :args => [],                               :control_flow => :next
-    opcode 110, :push_mirror,                 :stack => [0, 1],     :args => [],                               :control_flow => :next
+    opcode 80, :kind_of,                     :stack => [2, 1],     :args => [],                               :control_flow => :next
+    opcode 81, :instance_of,                 :stack => [2, 1],     :args => [],                               :control_flow => :next
+    opcode 82, :push_my_offset,              :stack => [0, 1],     :args => [:index],                         :control_flow => :next
+    opcode 83, :zsuper,                      :stack => [1, 1],     :args => [:literal],                       :control_flow => :next
+    opcode 84, :push_block_arg,              :stack => [0, 1],     :args => [],                               :control_flow => :next
+    opcode 85, :push_undef,                  :stack => [0, 1],     :args => [],                               :control_flow => :next
+    opcode 86, :push_stack_local,            :stack => [0, 1],     :args => [:which],                         :control_flow => :next
+    opcode 87, :set_stack_local,             :stack => [1, 1],     :args => [:which],                         :control_flow => :next
+    opcode 88, :push_has_block,              :stack => [0, 1],     :args => [],                               :control_flow => :next
+    opcode 89, :push_proc,                   :stack => [0, 1],     :args => [],                               :control_flow => :next
+    opcode 90, :check_frozen,                :stack => [1, 1],     :args => [],                               :control_flow => :next
+    opcode 91, :cast_multi_value,            :stack => [1, 1],     :args => [],                               :control_flow => :next
+    opcode 92, :invoke_primitive,            :stack => [[0,2], 1], :args => [:literal, :count],               :control_flow => :next
+    opcode 93, :push_rubinius,               :stack => [0, 1],     :args => [],                               :control_flow => :next
+    opcode 94, :object_to_s,                 :stack => [1, 1],     :args => [:literal],                       :control_flow => :send
+    opcode 95, :push_type,                   :stack => [0, 1],     :args => [],                               :control_flow => :next
+    opcode 96, :push_mirror,                 :stack => [0, 1],     :args => [],                               :control_flow => :next
   end
 end

data/lib/rubinius/code/compiler/version.rb

@@ -1,5 +1,5 @@
 module CodeTools
   class Compiler
-    VERSION = "3.1"
+    VERSION = "3.2"
   end
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: rubinius-compiler
 version: !ruby/object:Gem::Version
-  version: '3.1'
+  version: '3.2'
 platform: ruby
 authors:
 - Brian Shirai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-29 00:00:00.000000000 Z
+date: 2016-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   name: bundler
-  type: :development
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   name: rake
-  type: :development
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-  prerelease: false
+  type: :development
 description: A Bytecode compiler for the Rubinius language platform.
 email:
 - brixen@gmail.com
@@ -77,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: A Bytecode compiler for the Rubinius language platform.