rubinius-compiler 3.10 → 3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43a70986619cb373730960efd90ca453c167d955
-  data.tar.gz: 491d005f82901b9b4892de820a6d5a3c914997c3
+  metadata.gz: c8e25cf5b00edecfb2fa3de4def48faf2e639713
+  data.tar.gz: ae202bbb811f2179678e09107fca764ca108c8b0
 SHA512:
-  metadata.gz: ee4b15f721f45fa9e9057c28aef06febccc47a7cc611a52e3ecf3bc8ae2edd76196d7d17cbb17d738a9d6dfe452fc3499e77d1c35eae8832742e474f83f43496
-  data.tar.gz: 5783d337b23a39cb4d1267854538cc620cade019e5cb22fb0d9a7365162d3d937dd119f0702248e0bbbd5515515d146e9c62940554918a416c76fd27629b968c
+  metadata.gz: 70eae3ed7eb9911927b64d561f05fe29630669658256827cf08dbd3435ef9b5b5330c745edddfe6e0a75a28ab269809333fcfe963f1c1dd99ee85bf6f0f0796d
+  data.tar.gz: 436ea87bfe2e8e7eb146e3496865fbedabccd4898599abf1da9b9d06fa39beabbd4796f2bce344f60f1497f7a1f46f714bb6fdcfe0d1ac516ec4bb196b1e7d7c

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

@@ -595,129 +595,122 @@ module CodeTools
         @instruction = 71
       end
 
-      def run_exception
-        @stream << 72
-        @ip += 1
-        @current_block.add_stack(0, 0)
-        @instruction = 72
-      end
-
       def send_method(arg1)
         arg1 = find_literal(arg1)
-        @stream << 73 << arg1
+        @stream << 72 << arg1
         @ip += 2
         @current_block.add_stack(1, 1)
-        @instruction = 73
+        @instruction = 72
       end
 
       def send_stack(arg1, arg2)
         arg1 = find_literal(arg1)
         arg2 = Integer(arg2)
-        @stream << 74 << arg1 << arg2
+        @stream << 73 << arg1 << arg2
         @ip += 3
         @current_block.add_stack(arg2+1, 1)
-        @instruction = 74
+        @instruction = 73
       end
 
       def send_stack_with_block(arg1, arg2)
         arg1 = find_literal(arg1)
         arg2 = Integer(arg2)
-        @stream << 75 << arg1 << arg2
+        @stream << 74 << arg1 << arg2
         @ip += 3
         @current_block.add_stack(arg2+2, 1)
-        @instruction = 75
+        @instruction = 74
       end
 
       def send_stack_with_splat(arg1, arg2)
         arg1 = find_literal(arg1)
         arg2 = Integer(arg2)
-        @stream << 76 << arg1 << arg2
+        @stream << 75 << arg1 << arg2
         @ip += 3
         @current_block.add_stack(arg2+3, 1)
-        @instruction = 76
+        @instruction = 75
       end
 
       def send_super_stack_with_block(arg1, arg2)
         arg1 = find_literal(arg1)
         arg2 = Integer(arg2)
-        @stream << 77 << arg1 << arg2
+        @stream << 76 << arg1 << arg2
         @ip += 3
         @current_block.add_stack(arg2+1, 1)
-        @instruction = 77
+        @instruction = 76
       end
 
       def send_super_stack_with_splat(arg1, arg2)
         arg1 = find_literal(arg1)
         arg2 = Integer(arg2)
-        @stream << 78 << arg1 << arg2
+        @stream << 77 << arg1 << arg2
         @ip += 3
         @current_block.add_stack(arg2+2, 1)
-        @instruction = 78
+        @instruction = 77
       end
 
       def send_vcall(arg1)
         arg1 = find_literal(arg1)
-        @stream << 79 << arg1
+        @stream << 78 << arg1
         @ip += 2
         @current_block.add_stack(0, 1)
-        @instruction = 79
+        @instruction = 78
       end
 
       def set_call_flags(arg1)
-        @stream << 80 << arg1
+        @stream << 79 << arg1
         @ip += 2
         @current_block.add_stack(0, 0)
-        @instruction = 80
+        @instruction = 79
       end
 
       def set_const(arg1)
         arg1 = find_literal(arg1)
-        @stream << 81 << arg1
+        @stream << 80 << arg1
         @ip += 2
         @current_block.add_stack(1, 1)
-        @instruction = 81
+        @instruction = 80
       end
 
       def set_const_at(arg1)
         arg1 = find_literal(arg1)
-        @stream << 82 << arg1
+        @stream << 81 << arg1
         @ip += 2
         @current_block.add_stack(2, 1)
-        @instruction = 82
+        @instruction = 81
       end
 
       def set_ivar(arg1)
         arg1 = find_literal(arg1)
-        @stream << 83 << arg1
+        @stream << 82 << arg1
         @ip += 2
         @current_block.add_stack(1, 1)
-        @instruction = 83
+        @instruction = 82
       end
 
       def set_local(arg1)
-        @stream << 84 << arg1
+        @stream << 83 << arg1
         @ip += 2
         @current_block.add_stack(1, 1)
-        @instruction = 84
+        @instruction = 83
       end
 
       def set_local_depth(arg1, arg2)
-        @stream << 85 << arg1 << arg2
+        @stream << 84 << arg1 << arg2
         @ip += 3
         @current_block.add_stack(1, 1)
-        @instruction = 85
+        @instruction = 84
       end
 
       def set_stack_local(arg1)
-        @stream << 86 << arg1
+        @stream << 85 << arg1
         @ip += 2
         @current_block.add_stack(1, 1)
-        @instruction = 86
+        @instruction = 85
       end
 
       def setup_unwind(arg1, arg2)
         location = @ip + 1
-        @stream << 87 << arg1 << arg2
+        @stream << 86 << arg1 << arg2
         @ip += 3
         arg1.used_at location
         @current_block.add_stack(0, 0)
@@ -726,49 +719,56 @@ module CodeTools
         block = new_basic_block
         @current_block.right = block
         @current_block = block
-        @instruction = 87
+        @instruction = 86
       end
 
       def shift_array
-        @stream << 88
+        @stream << 87
         @ip += 1
         @current_block.add_stack(1, 2)
-        @instruction = 88
+        @instruction = 87
       end
 
       def store_my_field(arg1)
-        @stream << 89 << arg1
+        @stream << 88 << arg1
         @ip += 2
         @current_block.add_stack(1, 1)
-        @instruction = 89
+        @instruction = 88
       end
 
       def string_append
-        @stream << 90
+        @stream << 89
         @ip += 1
         @current_block.add_stack(2, 1)
-        @instruction = 90
+        @instruction = 89
       end
 
       def string_build(arg1)
         arg1 = Integer(arg1)
-        @stream << 91 << arg1
+        @stream << 90 << arg1
         @ip += 2
         @current_block.add_stack(arg1, 1)
-        @instruction = 91
+        @instruction = 90
       end
 
       def string_dup
-        @stream << 92
+        @stream << 91
         @ip += 1
         @current_block.add_stack(1, 1)
-        @instruction = 92
+        @instruction = 91
       end
 
       def swap
-        @stream << 93
+        @stream << 92
         @ip += 1
         @current_block.add_stack(2, 2)
+        @instruction = 92
+      end
+
+      def unwind(arg1, arg2, arg3)
+        @stream << 93 << arg1 << arg2 << arg3
+        @ip += 4
+        @current_block.add_stack(0, 0)
         @instruction = 93
       end
 

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

@@ -77,28 +77,28 @@ module Rubinius
     opcode 69, :restore_exception_state,     :stack => [1, 0],     :args => [],                               :control_flow => :next
     opcode 70, :ret,                         :stack => [1, 1],     :args => [],                               :control_flow => :return
     opcode 71, :rotate,                      :stack => [[0,1], [0, 1, 1]],:args => [:count],                         :control_flow => :next
-    opcode 72, :run_exception,               :stack => [0, 0],     :args => [],                               :control_flow => :next
-    opcode 73, :send_method,                 :stack => [1, 1],     :args => [:literal],                       :control_flow => :send
-    opcode 74, :send_stack,                  :stack => [[1,2], 1], :args => [:literal, :count],               :control_flow => :send
-    opcode 75, :send_stack_with_block,       :stack => [[2,2], 1], :args => [:literal, :count],               :control_flow => :send
-    opcode 76, :send_stack_with_splat,       :stack => [[3,2], 1], :args => [:literal, :count],               :control_flow => :send
-    opcode 77, :send_super_stack_with_block, :stack => [[1,2], 1], :args => [:literal, :count],               :control_flow => :send
-    opcode 78, :send_super_stack_with_splat, :stack => [[2,2], 1], :args => [:literal, :count],               :control_flow => :send
-    opcode 79, :send_vcall,                  :stack => [0, 1],     :args => [:literal],                       :control_flow => :send
-    opcode 80, :set_call_flags,              :stack => [0, 0],     :args => [:flags],                         :control_flow => :next
-    opcode 81, :set_const,                   :stack => [1, 1],     :args => [:literal],                       :control_flow => :next
-    opcode 82, :set_const_at,                :stack => [2, 1],     :args => [:literal],                       :control_flow => :next
-    opcode 83, :set_ivar,                    :stack => [1, 1],     :args => [:literal],                       :control_flow => :next
-    opcode 84, :set_local,                   :stack => [1, 1],     :args => [:local],                         :control_flow => :next
-    opcode 85, :set_local_depth,             :stack => [1, 1],     :args => [:depth, :index],                 :control_flow => :next
-    opcode 86, :set_stack_local,             :stack => [1, 1],     :args => [:which],                         :control_flow => :next
-    opcode 87, :setup_unwind,                :stack => [0, 0],     :args => [:ip, :type],                     :control_flow => :handler
-    opcode 88, :shift_array,                 :stack => [1, 2],     :args => [],                               :control_flow => :next
-    opcode 89, :store_my_field,              :stack => [1, 1],     :args => [:index],                         :control_flow => :next
-    opcode 90, :string_append,               :stack => [2, 1],     :args => [],                               :control_flow => :next
-    opcode 91, :string_build,                :stack => [[0,1], 1], :args => [:count],                         :control_flow => :next
-    opcode 92, :string_dup,                  :stack => [1, 1],     :args => [],                               :control_flow => :next
-    opcode 93, :swap,                        :stack => [2, 2],     :args => [],                               :control_flow => :next
+    opcode 72, :send_method,                 :stack => [1, 1],     :args => [:literal],                       :control_flow => :send
+    opcode 73, :send_stack,                  :stack => [[1,2], 1], :args => [:literal, :count],               :control_flow => :send
+    opcode 74, :send_stack_with_block,       :stack => [[2,2], 1], :args => [:literal, :count],               :control_flow => :send
+    opcode 75, :send_stack_with_splat,       :stack => [[3,2], 1], :args => [:literal, :count],               :control_flow => :send
+    opcode 76, :send_super_stack_with_block, :stack => [[1,2], 1], :args => [:literal, :count],               :control_flow => :send
+    opcode 77, :send_super_stack_with_splat, :stack => [[2,2], 1], :args => [:literal, :count],               :control_flow => :send
+    opcode 78, :send_vcall,                  :stack => [0, 1],     :args => [:literal],                       :control_flow => :send
+    opcode 79, :set_call_flags,              :stack => [0, 0],     :args => [:flags],                         :control_flow => :next
+    opcode 80, :set_const,                   :stack => [1, 1],     :args => [:literal],                       :control_flow => :next
+    opcode 81, :set_const_at,                :stack => [2, 1],     :args => [:literal],                       :control_flow => :next
+    opcode 82, :set_ivar,                    :stack => [1, 1],     :args => [:literal],                       :control_flow => :next
+    opcode 83, :set_local,                   :stack => [1, 1],     :args => [:local],                         :control_flow => :next
+    opcode 84, :set_local_depth,             :stack => [1, 1],     :args => [:depth, :index],                 :control_flow => :next
+    opcode 85, :set_stack_local,             :stack => [1, 1],     :args => [:which],                         :control_flow => :next
+    opcode 86, :setup_unwind,                :stack => [0, 0],     :args => [:ip, :type],                     :control_flow => :handler
+    opcode 87, :shift_array,                 :stack => [1, 2],     :args => [],                               :control_flow => :next
+    opcode 88, :store_my_field,              :stack => [1, 1],     :args => [:index],                         :control_flow => :next
+    opcode 89, :string_append,               :stack => [2, 1],     :args => [],                               :control_flow => :next
+    opcode 90, :string_build,                :stack => [[0,1], 1], :args => [:count],                         :control_flow => :next
+    opcode 91, :string_dup,                  :stack => [1, 1],     :args => [],                               :control_flow => :next
+    opcode 92, :swap,                        :stack => [2, 2],     :args => [],                               :control_flow => :next
+    opcode 93, :unwind,                      :stack => [0, 0],     :args => [:ip,, :stack,, :type],              :control_flow => :next
     opcode 94, :yield_debugger,              :stack => [0, 0],     :args => [],                               :control_flow => :next
     opcode 95, :yield_splat,                 :stack => [[1,1], 1], :args => [:count],                         :control_flow => :yield
     opcode 96, :yield_stack,                 :stack => [[0,1], 1], :args => [:count],                         :control_flow => :yield

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

@@ -1,5 +1,5 @@
 module CodeTools
   class Compiler
-    VERSION = "3.10"
+    VERSION = "3.11"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubinius-compiler
 version: !ruby/object:Gem::Version
-  version: '3.10'
+  version: '3.11'
 platform: ruby
 authors:
 - Brian Shirai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-09 00:00:00.000000000 Z
+date: 2017-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler