rubinius-compiler 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88bdb00808bc7bbb05baf430787b8b6ba1db40a2
-  data.tar.gz: 0b4305c8e6e47805a24495331e5de262731425b9
+  metadata.gz: e68f0fc260745783eba82d2ba135d21699db9350
+  data.tar.gz: 19d09c8b2e07bbd63c23a1768ca53c9316886fcd
 SHA512:
-  metadata.gz: 4a4fa98f86f6a53c33f8446077ef1a3d138c45f4789262d379d71c9121b9f3f29bc5593723e0fdce52a7f04af31f7a78a992f781c68d20911abda1b85b7433eb
-  data.tar.gz: f9c09ab593b0ade87108ae31d079f5f673efea61fd0d8b74f3ec9d80bc34ded68684c047786dfc90b2303fbeea123f780fd8ddc10c657004437cec2c18555965
+  metadata.gz: 02a2111f41bfcfb73aa96d648adaa8dddc4144833fe6b12c76619eeb483c2b204c5cddd202f13295a935446a3f269d4bb5ada289b137c1f518c52fa16740d48c
+  data.tar.gz: 7e79d508f8c7bd555d05c0944c56e8b55bbbed2f50061775aa70645c0614f6b02bf2ba2b80cadc4447be6f7b15966db1d1e52ab0c749f1360c034318743eaecd

data/lib/rubinius/compiler/generator.rb

@@ -452,6 +452,12 @@ module CodeTools
     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

data/lib/rubinius/compiler/generator_methods.rb

@@ -113,139 +113,223 @@ module CodeTools
         @instruction = 10
       end
 
+      def goto_if_nil(arg1)
+        location = @ip + 1
+        @stream << 11 << arg1
+        @ip += 2
+        arg1.used_at location
+        @current_block.add_stack(1, 0)
+        @current_block.left = arg1.basic_block
+        @current_block.close
+        block = new_basic_block
+        @current_block.right = block
+        @current_block = block
+        @instruction = 11
+      end
+
+      def goto_if_not_nil(arg1)
+        location = @ip + 1
+        @stream << 12 << arg1
+        @ip += 2
+        arg1.used_at location
+        @current_block.add_stack(1, 0)
+        @current_block.left = arg1.basic_block
+        @current_block.close
+        block = new_basic_block
+        @current_block.right = block
+        @current_block = block
+        @instruction = 12
+      end
+
+      def goto_if_undefined(arg1)
+        location = @ip + 1
+        @stream << 13 << arg1
+        @ip += 2
+        arg1.used_at location
+        @current_block.add_stack(1, 0)
+        @current_block.left = arg1.basic_block
+        @current_block.close
+        block = new_basic_block
+        @current_block.right = block
+        @current_block = block
+        @instruction = 13
+      end
+
+      def goto_if_not_undefined(arg1)
+        location = @ip + 1
+        @stream << 14 << arg1
+        @ip += 2
+        arg1.used_at location
+        @current_block.add_stack(1, 0)
+        @current_block.left = arg1.basic_block
+        @current_block.close
+        block = new_basic_block
+        @current_block.right = block
+        @current_block = block
+        @instruction = 14
+      end
+
+      def goto_if_equal(arg1)
+        location = @ip + 1
+        @stream << 15 << arg1
+        @ip += 2
+        arg1.used_at location
+        @current_block.add_stack(2, 0)
+        @current_block.left = arg1.basic_block
+        @current_block.close
+        block = new_basic_block
+        @current_block.right = block
+        @current_block = block
+        @instruction = 15
+      end
+
+      def goto_if_not_equal(arg1)
+        location = @ip + 1
+        @stream << 16 << arg1
+        @ip += 2
+        arg1.used_at location
+        @current_block.add_stack(2, 0)
+        @current_block.left = arg1.basic_block
+        @current_block.close
+        block = new_basic_block
+        @current_block.right = block
+        @current_block = block
+        @instruction = 16
+      end
+
       def ret
-        @stream << 11
+        @stream << 17
         @ip += 1
         @current_block.add_stack(1, 1)
         @current_block.close true
         @current_block = new_basic_block
-        @instruction = 11
+        @instruction = 17
       end
 
       def swap_stack
-        @stream << 12
+        @stream << 18
         @ip += 1
         @current_block.add_stack(2, 2)
-        @instruction = 12
+        @instruction = 18
       end
 
       def dup_top
-        @stream << 13
+        @stream << 19
         @ip += 1
         @current_block.add_stack(1, 2)
-        @instruction = 13
+        @instruction = 19
       end
 
       def dup_many(arg1)
-        @stream << 14 << arg1
+        @stream << 20 << arg1
         @ip += 2
         @current_block.add_stack(arg1, (arg1 * 2))
-        @instruction = 14
+        @instruction = 20
       end
 
       def pop
-        @stream << 15
+        @stream << 21
         @ip += 1
         @current_block.add_stack(1, 0)
-        @instruction = 15
+        @instruction = 21
       end
 
       def pop_many(arg1)
-        @stream << 16 << arg1
+        @stream << 22 << arg1
         @ip += 2
         @current_block.add_stack(arg1, 0)
-        @instruction = 16
+        @instruction = 22
       end
 
       def rotate(arg1)
-        @stream << 17 << arg1
+        @stream << 23 << arg1
         @ip += 2
         @current_block.add_stack(arg1, (arg1 * 1))
-        @instruction = 17
+        @instruction = 23
       end
 
       def move_down(arg1)
-        @stream << 18 << arg1
+        @stream << 24 << arg1
         @ip += 2
         @current_block.add_stack(arg1, (arg1 * 1))
-        @instruction = 18
+        @instruction = 24
       end
 
       def set_local(arg1)
-        @stream << 19 << arg1
+        @stream << 25 << arg1
         @ip += 2
         @current_block.add_stack(1, 1)
-        @instruction = 19
+        @instruction = 25
       end
 
       def push_local(arg1)
-        @stream << 20 << arg1
+        @stream << 26 << arg1
         @ip += 2
         @current_block.add_stack(0, 1)
-        @instruction = 20
+        @instruction = 26
       end
 
       def push_local_depth(arg1, arg2)
-        @stream << 21 << arg1 << arg2
+        @stream << 27 << arg1 << arg2
         @ip += 3
         @current_block.add_stack(0, 1)
-        @instruction = 21
+        @instruction = 27
       end
 
       def set_local_depth(arg1, arg2)
-        @stream << 22 << arg1 << arg2
+        @stream << 28 << arg1 << arg2
         @ip += 3
         @current_block.add_stack(1, 1)
-        @instruction = 22
+        @instruction = 28
       end
 
       def passed_arg(arg1)
-        @stream << 23 << arg1
+        @stream << 29 << arg1
         @ip += 2
         @current_block.add_stack(0, 1)
-        @instruction = 23
+        @instruction = 29
       end
 
       def push_current_exception
-        @stream << 24
+        @stream << 30
         @ip += 1
         @current_block.add_stack(0, 1)
-        @instruction = 24
+        @instruction = 30
       end
 
       def clear_exception
-        @stream << 25
+        @stream << 31
         @ip += 1
         @current_block.add_stack(0, 0)
-        @instruction = 25
+        @instruction = 31
       end
 
       def push_exception_state
-        @stream << 26
+        @stream << 32
         @ip += 1
         @current_block.add_stack(0, 1)
-        @instruction = 26
+        @instruction = 32
       end
 
       def restore_exception_state
-        @stream << 27
+        @stream << 33
         @ip += 1
         @current_block.add_stack(1, 0)
-        @instruction = 27
+        @instruction = 33
       end
 
       def raise_exc
-        @stream << 28
+        @stream << 34
         @ip += 1
         @current_block.add_stack(1, 0)
         @current_block.close false
         @current_block = new_basic_block
-        @instruction = 28
+        @instruction = 34
       end
 
       def setup_unwind(arg1, arg2)
         location = @ip + 1
-        @stream << 29 << arg1 << arg2
+        @stream << 35 << arg1 << arg2
         @ip += 3
         arg1.used_at location
         @current_block.add_stack(0, 0)
@@ -254,548 +338,548 @@ module CodeTools
         block = new_basic_block
         @current_block.right = block
         @current_block = block
-        @instruction = 29
+        @instruction = 35
       end
 
       def pop_unwind
-        @stream << 30
+        @stream << 36
         @ip += 1
         @current_block.add_stack(0, 0)
-        @instruction = 30
+        @instruction = 36
       end
 
       def raise_return
-        @stream << 31
+        @stream << 37
         @ip += 1
         @current_block.add_stack(1, 1)
         @current_block.close true
         @current_block = new_basic_block
-        @instruction = 31
+        @instruction = 37
       end
 
       def ensure_return
-        @stream << 32
+        @stream << 38
         @ip += 1
         @current_block.add_stack(1, 1)
         @current_block.close true
         @current_block = new_basic_block
-        @instruction = 32
+        @instruction = 38
       end
 
       def raise_break
-        @stream << 33
+        @stream << 39
         @ip += 1
         @current_block.add_stack(1, 1)
         @current_block.close false
         @current_block = new_basic_block
-        @instruction = 33
+        @instruction = 39
       end
 
       def reraise
-        @stream << 34
+        @stream << 40
         @ip += 1
         @current_block.add_stack(0, 0)
         @current_block.close false
         @current_block = new_basic_block
-        @instruction = 34
+        @instruction = 40
       end
 
       def make_array(arg1)
-        @stream << 35 << arg1
+        @stream << 41 << arg1
         @ip += 2
         @current_block.add_stack(arg1, 1)
-        @instruction = 35
+        @instruction = 41
       end
 
       def cast_array
-        unless @instruction == 36 or @instruction == 35
-          @stream << 36
+        unless @instruction == 42 or @instruction == 41
+          @stream << 42
           @ip += 1
         end
-        @instruction = 36
+        @instruction = 42
       end
 
       def shift_array
-        @stream << 37
+        @stream << 43
         @ip += 1
         @current_block.add_stack(1, 2)
-        @instruction = 37
+        @instruction = 43
       end
 
       def set_ivar(arg1)
         arg1 = find_literal arg1
-        @stream << 38 << arg1
+        @stream << 44 << arg1
         @ip += 2
         @current_block.add_stack(1, 1)
-        @instruction = 38
+        @instruction = 44
       end
 
       def push_ivar(arg1)
         arg1 = find_literal arg1
-        @stream << 39 << arg1
+        @stream << 45 << arg1
         @ip += 2
         @current_block.add_stack(0, 1)
-        @instruction = 39
+        @instruction = 45
       end
 
       def set_const(arg1)
-        @stream << 41 << arg1
+        @stream << 47 << arg1
         @ip += 2
         @current_block.add_stack(1, 1)
-        @instruction = 41
+        @instruction = 47
       end
 
       def set_const_at(arg1)
-        @stream << 42 << arg1
+        @stream << 48 << arg1
         @ip += 2
         @current_block.add_stack(2, 1)
-        @instruction = 42
+        @instruction = 48
       end
 
       def find_const(arg1)
         arg1 = find_literal arg1
-        @stream << 43 << arg1
+        @stream << 49 << arg1
         @ip += 2
         @current_block.add_stack(1, 1)
-        @instruction = 43
+        @instruction = 49
       end
 
       def push_cpath_top
-        @stream << 44
+        @stream << 50
         @ip += 1
         @current_block.add_stack(0, 1)
-        @instruction = 44
+        @instruction = 50
       end
 
       def push_const_fast(arg1)
-        @stream << 45 << arg1
+        @stream << 51 << arg1
         @ip += 2
         @current_block.add_stack(0, 1)
-        @instruction = 45
+        @instruction = 51
       end
 
       def find_const_fast(arg1)
-        @stream << 46 << arg1
+        @stream << 52 << arg1
         @ip += 2
         @current_block.add_stack(1, 1)
-        @instruction = 46
+        @instruction = 52
       end
 
       def set_call_flags(arg1)
-        @stream << 47 << arg1
+        @stream << 53 << arg1
         @ip += 2
         @current_block.add_stack(0, 0)
-        @instruction = 47
+        @instruction = 53
       end
 
       def allow_private
-        @stream << 48
+        @stream << 54
         @ip += 1
         @current_block.add_stack(0, 0)
-        @instruction = 48
+        @instruction = 54
       end
 
       def send_method(arg1)
-        @stream << 49 << arg1
+        @stream << 55 << arg1
         @ip += 2
         @current_block.add_stack(1, 1)
-        @instruction = 49
+        @instruction = 55
       end
 
       def send_stack(arg1, arg2)
-        @stream << 50 << arg1 << arg2
+        @stream << 56 << arg1 << arg2
         @ip += 3
         @current_block.add_stack(arg2+1, 1)
-        @instruction = 50
+        @instruction = 56
       end
 
       def send_stack_with_block(arg1, arg2)
-        @stream << 51 << arg1 << arg2
+        @stream << 57 << arg1 << arg2
         @ip += 3
         @current_block.add_stack(arg2+2, 1)
-        @instruction = 51
+        @instruction = 57
       end
 
       def send_stack_with_splat(arg1, arg2)
-        @stream << 52 << arg1 << arg2
+        @stream << 58 << arg1 << arg2
         @ip += 3
         @current_block.add_stack(arg2+3, 1)
-        @instruction = 52
+        @instruction = 58
       end
 
       def send_super_stack_with_block(arg1, arg2)
-        @stream << 53 << arg1 << arg2
+        @stream << 59 << arg1 << arg2
         @ip += 3
         @current_block.add_stack(arg2+1, 1)
-        @instruction = 53
+        @instruction = 59
       end
 
       def send_super_stack_with_splat(arg1, arg2)
-        @stream << 54 << arg1 << arg2
+        @stream << 60 << arg1 << arg2
         @ip += 3
         @current_block.add_stack(arg2+2, 1)
-        @instruction = 54
+        @instruction = 60
       end
 
       def push_block
-        @stream << 55
+        @stream << 61
         @ip += 1
         @current_block.add_stack(0, 1)
-        @instruction = 55
+        @instruction = 61
       end
 
       def passed_blockarg(arg1)
-        @stream << 56 << arg1
+        @stream << 62 << arg1
         @ip += 2
         @current_block.add_stack(0, 1)
-        @instruction = 56
+        @instruction = 62
       end
 
       def create_block(arg1)
         arg1 = add_literal arg1
         @generators << arg1
-        @stream << 57 << arg1
+        @stream << 63 << arg1
         @ip += 2
         @current_block.add_stack(0, 1)
-        @instruction = 57
+        @instruction = 63
       end
 
       def cast_for_single_block_arg
-        @stream << 58
+        @stream << 64
         @ip += 1
         @current_block.add_stack(0, 1)
-        @instruction = 58
+        @instruction = 64
       end
 
       def cast_for_multi_block_arg
-        @stream << 59
+        @stream << 65
         @ip += 1
         @current_block.add_stack(0, 1)
-        @instruction = 59
+        @instruction = 65
       end
 
       def cast_for_splat_block_arg
-        @stream << 60
+        @stream << 66
         @ip += 1
         @current_block.add_stack(0, 1)
-        @instruction = 60
+        @instruction = 66
       end
 
       def yield_stack(arg1)
-        @stream << 61 << arg1
+        @stream << 67 << arg1
         @ip += 2
         @current_block.add_stack(arg1, 1)
-        @instruction = 61
+        @instruction = 67
       end
 
       def yield_splat(arg1)
-        @stream << 62 << arg1
+        @stream << 68 << arg1
         @ip += 2
         @current_block.add_stack(arg1+1, 1)
-        @instruction = 62
+        @instruction = 68
       end
 
       def string_append
-        @stream << 63
+        @stream << 69
         @ip += 1
         @current_block.add_stack(2, 1)
-        @instruction = 63
+        @instruction = 69
       end
 
       def string_build(arg1)
-        @stream << 64 << arg1
+        @stream << 70 << arg1
         @ip += 2
         @current_block.add_stack(arg1, 1)
-        @instruction = 64
+        @instruction = 70
       end
 
       def string_dup
-        @stream << 65
+        @stream << 71
         @ip += 1
         @current_block.add_stack(1, 1)
-        @instruction = 65
+        @instruction = 71
       end
 
       def push_scope
-        @stream << 66
+        @stream << 72
         @ip += 1
         @current_block.add_stack(0, 1)
-        @instruction = 66
+        @instruction = 72
       end
 
       def add_scope
-        @stream << 67
+        @stream << 73
         @ip += 1
         @current_block.add_stack(1, 0)
-        @instruction = 67
+        @instruction = 73
       end
 
       def push_variables
-        @stream << 68
+        @stream << 74
         @ip += 1
         @current_block.add_stack(0, 1)
-        @instruction = 68
+        @instruction = 74
       end
 
       def check_interrupts
-        @stream << 69
+        @stream << 75
         @ip += 1
         @current_block.add_stack(0, 0)
-        @instruction = 69
+        @instruction = 75
       end
 
       def yield_debugger
-        @stream << 70
+        @stream << 76
         @ip += 1
         @current_block.add_stack(0, 0)
-        @instruction = 70
+        @instruction = 76
       end
 
       def is_nil
-        @stream << 71
+        @stream << 77
         @ip += 1
         @current_block.add_stack(1, 1)
-        @instruction = 71
+        @instruction = 77
       end
 
       def check_serial(arg1, arg2)
         arg1 = find_literal arg1
         arg2 = Integer(arg2)
-        @stream << 72 << arg1 << arg2
+        @stream << 78 << arg1 << arg2
         @ip += 3
         @current_block.add_stack(1, 1)
-        @instruction = 72
+        @instruction = 78
       end
 
       def check_serial_private(arg1, arg2)
         arg1 = find_literal arg1
         arg2 = Integer(arg2)
-        @stream << 73 << arg1 << arg2
+        @stream << 79 << arg1 << arg2
         @ip += 3
         @current_block.add_stack(1, 1)
-        @instruction = 73
+        @instruction = 79
       end
 
       def push_my_field(arg1)
-        @stream << 74 << arg1
+        @stream << 80 << arg1
         @ip += 2
         @current_block.add_stack(0, 1)
-        @instruction = 74
+        @instruction = 80
       end
 
       def store_my_field(arg1)
-        @stream << 75 << arg1
+        @stream << 81 << arg1
         @ip += 2
         @current_block.add_stack(1, 1)
-        @instruction = 75
+        @instruction = 81
       end
 
       def kind_of
-        @stream << 76
+        @stream << 82
         @ip += 1
         @current_block.add_stack(2, 1)
-        @instruction = 76
+        @instruction = 82
       end
 
       def instance_of
-        @stream << 77
+        @stream << 83
         @ip += 1
         @current_block.add_stack(2, 1)
-        @instruction = 77
+        @instruction = 83
       end
 
       def meta_push_neg_1
-        @stream << 78
+        @stream << 84
         @ip += 1
         @current_block.add_stack(0, 1)
-        @instruction = 78
+        @instruction = 84
       end
 
       def meta_push_0
-        @stream << 79
+        @stream << 85
         @ip += 1
         @current_block.add_stack(0, 1)
-        @instruction = 79
+        @instruction = 85
       end
 
       def meta_push_1
-        @stream << 80
+        @stream << 86
         @ip += 1
         @current_block.add_stack(0, 1)
-        @instruction = 80
+        @instruction = 86
       end
 
       def meta_push_2
-        @stream << 81
+        @stream << 87
         @ip += 1
         @current_block.add_stack(0, 1)
-        @instruction = 81
+        @instruction = 87
       end
 
       def meta_send_op_plus(arg1)
-        @stream << 82 << arg1
+        @stream << 88 << arg1
         @ip += 2
         @current_block.add_stack(2, 1)
-        @instruction = 82
+        @instruction = 88
       end
 
       def meta_send_op_minus(arg1)
-        @stream << 83 << arg1
+        @stream << 89 << arg1
         @ip += 2
         @current_block.add_stack(2, 1)
-        @instruction = 83
+        @instruction = 89
       end
 
       def meta_send_op_equal(arg1)
-        @stream << 84 << arg1
+        @stream << 90 << arg1
         @ip += 2
         @current_block.add_stack(2, 1)
-        @instruction = 84
+        @instruction = 90
       end
 
       def meta_send_op_lt(arg1)
-        @stream << 85 << arg1
+        @stream << 91 << arg1
         @ip += 2
         @current_block.add_stack(2, 1)
-        @instruction = 85
+        @instruction = 91
       end
 
       def meta_send_op_gt(arg1)
-        @stream << 86 << arg1
+        @stream << 92 << arg1
         @ip += 2
         @current_block.add_stack(2, 1)
-        @instruction = 86
+        @instruction = 92
       end
 
       def meta_send_op_tequal(arg1)
-        @stream << 87 << arg1
+        @stream << 93 << arg1
         @ip += 2
         @current_block.add_stack(2, 1)
-        @instruction = 87
+        @instruction = 93
       end
 
       def meta_send_call(arg1, arg2)
-        @stream << 88 << arg1 << arg2
+        @stream << 94 << arg1 << arg2
         @ip += 3
         @current_block.add_stack(arg2+1, 1)
-        @instruction = 88
+        @instruction = 94
       end
 
       def push_my_offset(arg1)
-        @stream << 89 << arg1
+        @stream << 95 << arg1
         @ip += 2
         @current_block.add_stack(0, 1)
-        @instruction = 89
+        @instruction = 95
       end
 
       def zsuper(arg1)
         arg1 = find_literal arg1
-        @stream << 90 << arg1
+        @stream << 96 << arg1
         @ip += 2
         @current_block.add_stack(1, 1)
-        @instruction = 90
+        @instruction = 96
       end
 
       def push_block_arg
-        @stream << 91
+        @stream << 97
         @ip += 1
         @current_block.add_stack(0, 1)
-        @instruction = 91
+        @instruction = 97
       end
 
       def push_undef
-        @stream << 92
+        @stream << 98
         @ip += 1
         @current_block.add_stack(0, 1)
-        @instruction = 92
+        @instruction = 98
       end
 
       def push_stack_local(arg1)
-        @stream << 93 << arg1
+        @stream << 99 << arg1
         @ip += 2
         @current_block.add_stack(0, 1)
-        @instruction = 93
+        @instruction = 99
       end
 
       def set_stack_local(arg1)
-        @stream << 94 << arg1
+        @stream << 100 << arg1
         @ip += 2
         @current_block.add_stack(1, 1)
-        @instruction = 94
+        @instruction = 100
       end
 
       def push_has_block
-        @stream << 95
+        @stream << 101
         @ip += 1
         @current_block.add_stack(0, 1)
-        @instruction = 95
+        @instruction = 101
       end
 
       def push_proc
-        @stream << 96
+        @stream << 102
         @ip += 1
         @current_block.add_stack(0, 1)
-        @instruction = 96
+        @instruction = 102
       end
 
       def check_frozen
-        @stream << 97
+        @stream << 103
         @ip += 1
         @current_block.add_stack(1, 1)
-        @instruction = 97
+        @instruction = 103
       end
 
       def cast_multi_value
-        @stream << 98
+        @stream << 104
         @ip += 1
         @current_block.add_stack(1, 1)
-        @instruction = 98
+        @instruction = 104
       end
 
       def invoke_primitive(arg1, arg2)
         arg1 = find_literal arg1
         arg2 = Integer(arg2)
-        @stream << 99 << arg1 << arg2
+        @stream << 105 << arg1 << arg2
         @ip += 3
         @current_block.add_stack(arg2, 1)
-        @instruction = 99
+        @instruction = 105
       end
 
       def push_rubinius
-        @stream << 100
+        @stream << 106
         @ip += 1
         @current_block.add_stack(0, 1)
-        @instruction = 100
+        @instruction = 106
       end
 
       def call_custom(arg1, arg2)
         arg1 = find_literal arg1
         arg2 = Integer(arg2)
-        @stream << 101 << arg1 << arg2
+        @stream << 107 << arg1 << arg2
         @ip += 3
         @current_block.add_stack(arg2+1, 1)
-        @instruction = 101
+        @instruction = 107
       end
 
       def meta_to_s(arg1)
-        @stream << 102 << arg1
+        @stream << 108 << arg1
         @ip += 2
         @current_block.add_stack(1, 1)
-        @instruction = 102
+        @instruction = 108
       end
 
       def push_type
-        @stream << 103
+        @stream << 109
         @ip += 1
         @current_block.add_stack(0, 1)
-        @instruction = 103
+        @instruction = 109
       end
 
       def push_mirror
-        @stream << 104
+        @stream << 110
         @ip += 1
         @current_block.add_stack(0, 1)
-        @instruction = 104
+        @instruction = 110
       end
 
   end

data/lib/rubinius/compiler/opcodes.rb

@@ -19,132 +19,138 @@ module Rubinius
     opcode  8, :goto,                        :stack => [0, 0],     :args => [:location],                      :control_flow => :branch
     opcode  9, :goto_if_false,               :stack => [1, 0],     :args => [:location],                      :control_flow => :branch
     opcode 10, :goto_if_true,                :stack => [1, 0],     :args => [:location],                      :control_flow => :branch
-    opcode 11, :ret,                         :stack => [1, 1],     :args => [],                               :control_flow => :return
+    opcode 11, :goto_if_nil,                 :stack => [1, 0],     :args => [:location],                      :control_flow => :branch
+    opcode 12, :goto_if_not_nil,             :stack => [1, 0],     :args => [:location],                      :control_flow => :branch
+    opcode 13, :goto_if_undefined,           :stack => [1, 0],     :args => [:location],                      :control_flow => :branch
+    opcode 14, :goto_if_not_undefined,       :stack => [1, 0],     :args => [:location],                      :control_flow => :branch
+    opcode 15, :goto_if_equal,               :stack => [2, 0],     :args => [:location],                      :control_flow => :branch
+    opcode 16, :goto_if_not_equal,           :stack => [2, 0],     :args => [:location],                      :control_flow => :branch
+    opcode 17, :ret,                         :stack => [1, 1],     :args => [],                               :control_flow => :return
 
     # Stack manipulations
-    opcode 12, :swap_stack,                  :stack => [2, 2],     :args => [],                               :control_flow => :next
-    opcode 13, :dup_top,                     :stack => [1, 2],     :args => [],                               :control_flow => :next
-    opcode 14, :dup_many,                    :stack => [[0,1], [0, 1, 2]],:args => [:count],                         :control_flow => :next
-    opcode 15, :pop,                         :stack => [1, 0],     :args => [],                               :control_flow => :next
-    opcode 16, :pop_many,                    :stack => [[0,1], 0], :args => [:count],                         :control_flow => :next
-    opcode 17, :rotate,                      :stack => [[0,1], [0, 1, 1]],:args => [:count],                         :control_flow => :next
-    opcode 18, :move_down,                   :stack => [[0,1], [0, 1, 1]],:args => [:positions],                     :control_flow => :next
+    opcode 18, :swap_stack,                  :stack => [2, 2],     :args => [],                               :control_flow => :next
+    opcode 19, :dup_top,                     :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
+    opcode 23, :rotate,                      :stack => [[0,1], [0, 1, 1]],:args => [:count],                         :control_flow => :next
+    opcode 24, :move_down,                   :stack => [[0,1], [0, 1, 1]],:args => [:positions],                     :control_flow => :next
 
     # Manipulate local variables
-    opcode 19, :set_local,                   :stack => [1, 1],     :args => [:local],                         :control_flow => :next
-    opcode 20, :push_local,                  :stack => [0, 1],     :args => [:local],                         :control_flow => :next
-    opcode 21, :push_local_depth,            :stack => [0, 1],     :args => [:depth, :index],                 :control_flow => :next
-    opcode 22, :set_local_depth,             :stack => [1, 1],     :args => [:depth, :index],                 :control_flow => :next
-    opcode 23, :passed_arg,                  :stack => [0, 1],     :args => [:index],                         :control_flow => :next
+    opcode 25, :set_local,                   :stack => [1, 1],     :args => [:local],                         :control_flow => :next
+    opcode 26, :push_local,                  :stack => [0, 1],     :args => [:local],                         :control_flow => :next
+    opcode 27, :push_local_depth,            :stack => [0, 1],     :args => [:depth, :index],                 :control_flow => :next
+    opcode 28, :set_local_depth,             :stack => [1, 1],     :args => [:depth, :index],                 :control_flow => :next
+    opcode 29, :passed_arg,                  :stack => [0, 1],     :args => [:index],                         :control_flow => :next
 
     # Manipulate exceptions
-    opcode 24, :push_current_exception,      :stack => [0, 1],     :args => [],                               :control_flow => :next
-    opcode 25, :clear_exception,             :stack => [0, 0],     :args => [],                               :control_flow => :next
-    opcode 26, :push_exception_state,        :stack => [0, 1],     :args => [],                               :control_flow => :next
-    opcode 27, :restore_exception_state,     :stack => [1, 0],     :args => [],                               :control_flow => :next
-    opcode 28, :raise_exc,                   :stack => [1, 0],     :args => [],                               :control_flow => :raise
-    opcode 29, :setup_unwind,                :stack => [0, 0],     :args => [:ip, :type],                     :control_flow => :handler
-    opcode 30, :pop_unwind,                  :stack => [0, 0],     :args => [],                               :control_flow => :next
-    opcode 31, :raise_return,                :stack => [1, 1],     :args => [],                               :control_flow => :raise
-    opcode 32, :ensure_return,               :stack => [1, 1],     :args => [],                               :control_flow => :raise
-    opcode 33, :raise_break,                 :stack => [1, 1],     :args => [],                               :control_flow => :raise
-    opcode 34, :reraise,                     :stack => [0, 0],     :args => [],                               :control_flow => :raise
+    opcode 30, :push_current_exception,      :stack => [0, 1],     :args => [],                               :control_flow => :next
+    opcode 31, :clear_exception,             :stack => [0, 0],     :args => [],                               :control_flow => :next
+    opcode 32, :push_exception_state,        :stack => [0, 1],     :args => [],                               :control_flow => :next
+    opcode 33, :restore_exception_state,     :stack => [1, 0],     :args => [],                               :control_flow => :next
+    opcode 34, :raise_exc,                   :stack => [1, 0],     :args => [],                               :control_flow => :raise
+    opcode 35, :setup_unwind,                :stack => [0, 0],     :args => [:ip, :type],                     :control_flow => :handler
+    opcode 36, :pop_unwind,                  :stack => [0, 0],     :args => [],                               :control_flow => :next
+    opcode 37, :raise_return,                :stack => [1, 1],     :args => [],                               :control_flow => :raise
+    opcode 38, :ensure_return,               :stack => [1, 1],     :args => [],                               :control_flow => :raise
+    opcode 39, :raise_break,                 :stack => [1, 1],     :args => [],                               :control_flow => :raise
+    opcode 40, :reraise,                     :stack => [0, 0],     :args => [],                               :control_flow => :raise
 
     # Manipulate arrays
-    opcode 35, :make_array,                  :stack => [[0,1], 1], :args => [:count],                         :control_flow => :next
-    opcode 36, :cast_array,                  :stack => [1, 1],     :args => [],                               :control_flow => :next
-    opcode 37, :shift_array,                 :stack => [1, 2],     :args => [],                               :control_flow => :next
+    opcode 41, :make_array,                  :stack => [[0,1], 1], :args => [:count],                         :control_flow => :next
+    opcode 42, :cast_array,                  :stack => [1, 1],     :args => [],                               :control_flow => :next
+    opcode 43, :shift_array,                 :stack => [1, 2],     :args => [],                               :control_flow => :next
 
     # Manipulate instance variables
-    opcode 38, :set_ivar,                    :stack => [1, 1],     :args => [:literal],                       :control_flow => :next
-    opcode 39, :push_ivar,                   :stack => [0, 1],     :args => [:literal],                       :control_flow => :next
+    opcode 44, :set_ivar,                    :stack => [1, 1],     :args => [:literal],                       :control_flow => :next
+    opcode 45, :push_ivar,                   :stack => [0, 1],     :args => [:literal],                       :control_flow => :next
 
     # Manipulate constants
-    opcode 40, :push_const,                  :stack => [0, 1],     :args => [:literal],                       :control_flow => :next
-    opcode 41, :set_const,                   :stack => [1, 1],     :args => [:literal],                       :control_flow => :next
-    opcode 42, :set_const_at,                :stack => [2, 1],     :args => [:literal],                       :control_flow => :next
-    opcode 43, :find_const,                  :stack => [1, 1],     :args => [:literal],                       :control_flow => :next
-    opcode 44, :push_cpath_top,              :stack => [0, 1],     :args => [],                               :control_flow => :next
-    opcode 45, :push_const_fast,             :stack => [0, 1],     :args => [:literal],                       :control_flow => :next
-    opcode 46, :find_const_fast,             :stack => [1, 1],     :args => [:literal],                       :control_flow => :next
+    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
 
     # Send messages
-    opcode 47, :set_call_flags,              :stack => [0, 0],     :args => [:flags],                         :control_flow => :next
-    opcode 48, :allow_private,               :stack => [0, 0],     :args => [],                               :control_flow => :next
-    opcode 49, :send_method,                 :stack => [1, 1],     :args => [:literal],                       :control_flow => :send
-    opcode 50, :send_stack,                  :stack => [[1,2], 1], :args => [:literal, :count],               :control_flow => :send
-    opcode 51, :send_stack_with_block,       :stack => [[2,2], 1], :args => [:literal, :count],               :control_flow => :send
+    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
 
     CALL_FLAG_CONCAT = 2
 
-    opcode 52, :send_stack_with_splat,       :stack => [[3,2], 1], :args => [:literal, :count],               :control_flow => :send
-    opcode 53, :send_super_stack_with_block, :stack => [[1,2], 1], :args => [:literal, :count],               :control_flow => :send
-    opcode 54, :send_super_stack_with_splat, :stack => [[2,2], 1], :args => [:literal, :count],               :control_flow => :send
+    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
 
     # Manipulate blocks
-    opcode 55, :push_block,                  :stack => [0, 1],     :args => [],                               :control_flow => :next
-    opcode 56, :passed_blockarg,             :stack => [0, 1],     :args => [:count],                         :control_flow => :next
-    opcode 57, :create_block,                :stack => [0, 1],     :args => [:literal],                       :control_flow => :next
-    opcode 58, :cast_for_single_block_arg,   :stack => [0, 1],     :args => [],                               :control_flow => :next
-    opcode 59, :cast_for_multi_block_arg,    :stack => [0, 1],     :args => [],                               :control_flow => :next
-    opcode 60, :cast_for_splat_block_arg,    :stack => [0, 1],     :args => [],                               :control_flow => :next
-    opcode 61, :yield_stack,                 :stack => [[0,1], 1], :args => [:count],                         :control_flow => :yield
-    opcode 62, :yield_splat,                 :stack => [[1,1], 1], :args => [:count],                         :control_flow => :yield
+    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
 
     # Manipulate strings
-    opcode 63, :string_append,               :stack => [2, 1],     :args => [],                               :control_flow => :next
-    opcode 64, :string_build,                :stack => [[0,1], 1], :args => [:count],                         :control_flow => :next
-    opcode 65, :string_dup,                  :stack => [1, 1],     :args => [],                               :control_flow => :next
+    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
 
     # Manipulate scope
-    opcode 66, :push_scope,                  :stack => [0, 1],     :args => [],                               :control_flow => :next
-    opcode 67, :add_scope,                   :stack => [1, 0],     :args => [],                               :control_flow => :next
-    opcode 68, :push_variables,              :stack => [0, 1],     :args => [],                               :control_flow => :next
+    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
 
     # Miscellaneous. TODO: better categorize these
-    opcode 69, :check_interrupts,            :stack => [0, 0],     :args => [],                               :control_flow => :next
-    opcode 70, :yield_debugger,              :stack => [0, 0],     :args => [],                               :control_flow => :next
-    opcode 71, :is_nil,                      :stack => [1, 1],     :args => [],                               :control_flow => :next
-    opcode 72, :check_serial,                :stack => [1, 1],     :args => [:literal, :serial],              :control_flow => :next
-    opcode 73, :check_serial_private,        :stack => [1, 1],     :args => [:literal, :serial],              :control_flow => :next
+    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
 
     # Access object fields
-    opcode 74, :push_my_field,               :stack => [0, 1],     :args => [:index],                         :control_flow => :next
-    opcode 75, :store_my_field,              :stack => [1, 1],     :args => [:index],                         :control_flow => :next
+    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
 
     # Type checks
-    opcode 76, :kind_of,                     :stack => [2, 1],     :args => [],                               :control_flow => :next
-    opcode 77, :instance_of,                 :stack => [2, 1],     :args => [],                               :control_flow => :next
+    opcode 82, :kind_of,                     :stack => [2, 1],     :args => [],                               :control_flow => :next
+    opcode 83, :instance_of,                 :stack => [2, 1],     :args => [],                               :control_flow => :next
 
     # Optimizations
-    opcode 78, :meta_push_neg_1,             :stack => [0, 1],     :args => [],                               :control_flow => :next
-    opcode 79, :meta_push_0,                 :stack => [0, 1],     :args => [],                               :control_flow => :next
-    opcode 80, :meta_push_1,                 :stack => [0, 1],     :args => [],                               :control_flow => :next
-    opcode 81, :meta_push_2,                 :stack => [0, 1],     :args => [],                               :control_flow => :next
-    opcode 82, :meta_send_op_plus,           :stack => [2, 1],     :args => [:literal],                       :control_flow => :send
-    opcode 83, :meta_send_op_minus,          :stack => [2, 1],     :args => [:literal],                       :control_flow => :send
-    opcode 84, :meta_send_op_equal,          :stack => [2, 1],     :args => [:literal],                       :control_flow => :send
-    opcode 85, :meta_send_op_lt,             :stack => [2, 1],     :args => [:literal],                       :control_flow => :next
-    opcode 86, :meta_send_op_gt,             :stack => [2, 1],     :args => [:literal],                       :control_flow => :next
-    opcode 87, :meta_send_op_tequal,         :stack => [2, 1],     :args => [:literal],                       :control_flow => :send
-    opcode 88, :meta_send_call,              :stack => [[1,2], 1], :args => [:literal, :count],               :control_flow => :send
+    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 89, :push_my_offset,              :stack => [0, 1],     :args => [:index],                         :control_flow => :next
-    opcode 90, :zsuper,                      :stack => [1, 1],     :args => [:literal],                       :control_flow => :next
-    opcode 91, :push_block_arg,              :stack => [0, 1],     :args => [],                               :control_flow => :next
-    opcode 92, :push_undef,                  :stack => [0, 1],     :args => [],                               :control_flow => :next
-    opcode 93, :push_stack_local,            :stack => [0, 1],     :args => [:which],                         :control_flow => :next
-    opcode 94, :set_stack_local,             :stack => [1, 1],     :args => [:which],                         :control_flow => :next
-    opcode 95, :push_has_block,              :stack => [0, 1],     :args => [],                               :control_flow => :next
-    opcode 96, :push_proc,                   :stack => [0, 1],     :args => [],                               :control_flow => :next
-    opcode 97, :check_frozen,                :stack => [1, 1],     :args => [],                               :control_flow => :next
-    opcode 98, :cast_multi_value,            :stack => [1, 1],     :args => [],                               :control_flow => :next
-    opcode 99, :invoke_primitive,            :stack => [[0,2], 1], :args => [:literal, :count],               :control_flow => :next
-    opcode 100, :push_rubinius,               :stack => [0, 1],     :args => [],                               :control_flow => :next
-    opcode 101, :call_custom,                 :stack => [[1,2], 1], :args => [:literal, :count],               :control_flow => :send
-    opcode 102, :meta_to_s,                   :stack => [1, 1],     :args => [:literal],                       :control_flow => :send
-    opcode 103, :push_type,                   :stack => [0, 1],     :args => [],                               :control_flow => :next
-    opcode 104, :push_mirror,                 :stack => [0, 1],     :args => [],                               :control_flow => :next
+    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
   end
 end

data/lib/rubinius/compiler/version.rb

@@ -1,5 +1,5 @@
 module CodeTools
   class Compiler
-    VERSION = "2.2.1"
+    VERSION = "2.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubinius-compiler
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Brian Shirai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-24 00:00:00.000000000 Z
+date: 2014-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler