rubinius-compiler 3.17 → 3.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2b4f5a3bd5203cc42f5d4687caebc1e4caa1623
-  data.tar.gz: 421bd9c99074d933d3ba62199cf19b03d38640f3
+  metadata.gz: 76bbb59115b69488b3bae7ceb87d529e111df085
+  data.tar.gz: aaf210886daa34413c4effc21376a9ba8e9edcb6
 SHA512:
-  metadata.gz: ee7812010668b9b574dc8c85f570edfb8e248dc84778a930f76b0905591e6e6a7699440766f764d3dc311d71867ff7e3a671059378a2166e6e79bae834a9d0cb
-  data.tar.gz: df9e31a1f4486704e1f8da881e50d1dd5f617c342684af56a5aafc5155fda8b289bfea5c1dbe8a30450daa6e6d80831b5bc826f39432bea42daa3e086bba80ba
+  metadata.gz: 235c64593b20ce224501051550e04d7e708dbc087eddb98f30579d4397a1dfc5e639acdb6631b4406de57fc78b2b1523187f8044ea911e42161a5bc9481b4d7f
+  data.tar.gz: a3041a0a90f498b535f3029c1fd27268708ec7a2378b6fa68a79fc223de41bdc1347cb2fa38e028b35668b3b02f41708ae142962615ebca875aa229e4f06597d

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

@@ -452,16 +452,6 @@ module CodeTools
       Label.new(self)
     end
 
-    def new_unwind_label
-      label = Label.new(self, false)
-      label.place
-      label
-    end
-
-    def get_unwind_label
-      (state && state.unwind_label) || new_unwind_label
-    end
-
     # Helpers
 
     def new_basic_block
@@ -598,219 +588,187 @@ module CodeTools
     # instructions that can cause stack unwinding
 
     def cast_array
-      uw = get_unwind_label
       super
-      unwind uw
+      unwind
     end
 
     def cast_for_multi_block_arg
-      uw = get_unwind_label
       super
-      unwind uw
+      unwind
     end
 
     def cast_for_single_block_arg
-      uw = get_unwind_label
       super
-      unwind uw
+      unwind
     end
 
     def cast_for_splat_block_arg
-      uw = get_unwind_label
       super
-      unwind uw
+      unwind
     end
 
     def cast_multi_value
-      uw = get_unwind_label
       super
-      unwind uw
+      unwind
     end
 
     def check_frozen
-      uw = get_unwind_label
       super
-      unwind uw
+      unwind
     end
 
     def create_block(literal)
-      uw = get_unwind_label
       super
-      unwind uw
+      unwind
     end
 
     def ensure_return
-      uw = get_unwind_label
       super
-      unwind uw
+      unwind
     end
 
     def find_const(literal)
-      uw = get_unwind_label
       super
-      unwind uw
+      unwind
     end
 
     def invoke_primitive(literal, count)
-      uw = get_unwind_label
       super
-      unwind uw
+      unwind
     end
 
     def object_to_s(literal)
-      uw = get_unwind_label
       super
-      unwind uw
+      unwind
     end
 
     def passed_arg(index)
-      uw = get_unwind_label
       super
-      unwind uw
+      unwind
     end
 
     def passed_blockarg(count)
-      uw = get_unwind_label
       super
-      unwind uw
+      unwind
     end
 
     def push_block_arg
-      uw = get_unwind_label
       super
-      unwind uw
+      unwind
     end
 
     def push_const(literal)
-      uw = get_unwind_label
       super
-      unwind uw
+      unwind
     end
 
     def push_ivar(literal)
-      uw = get_unwind_label
       super
-      unwind uw
+      unwind
     end
 
     def push_local_depth(depth, index)
-      uw = get_unwind_label
       super
-      unwind uw
+      unwind
     end
 
     def push_proc
-      uw = get_unwind_label
       super
-      unwind uw
+      unwind
     end
 
     def raise_break
-      uw = get_unwind_label
       super
-      unwind uw
+      unwind
     end
 
     def raise_exc
-      uw = get_unwind_label
       super
-      unwind uw
+      unwind
     end
 
     def raise_return
-      uw = get_unwind_label
       super
-      unwind uw
+      unwind
     end
 
     def reraise
-      uw = get_unwind_label
       super
-      unwind uw
+      unwind
     end
 
     def send_method(literal)
-      uw = get_unwind_label
       super
-      unwind uw
+      unwind
     end
 
     def send_stack(literal, count)
-      uw = get_unwind_label
       super
-      unwind uw
+      unwind
     end
 
     def send_stack_with_block(literal, count)
-      uw = get_unwind_label
       super
-      unwind uw
+      unwind
     end
 
     def send_stack_with_splat(literal, count)
-      uw = get_unwind_label
       super
-      unwind uw
+      unwind
     end
 
     def send_super_stack_with_block(literal, count)
-      uw = get_unwind_label
       super
-      unwind uw
+      unwind
     end
 
     def send_super_stack_with_splat(literal, count)
-      uw = get_unwind_label
       super
-      unwind uw
+      unwind
     end
 
     def send_vcall(literal)
-      uw = get_unwind_label
       super
-      unwind uw
+      unwind
     end
 
     def set_ivar(literal)
-      uw = get_unwind_label
       super
-      unwind uw
+      unwind
     end
 
     def set_local_depth(depth, index)
-      uw = get_unwind_label
       super
-      unwind uw
+      unwind
     end
 
     def string_build(count)
-      uw = get_unwind_label
       super
-      unwind uw
+      unwind
     end
 
     def string_dup
-      uw = get_unwind_label
       super
-      unwind uw
+      unwind
+    end
+
+    def unwind
+      super 0
     end
 
     def yield_splat(count)
-      uw = get_unwind_label
       super
-      unwind uw
+      unwind
     end
 
     def yield_stack(count)
-      uw = get_unwind_label
       super
-      unwind uw
+      unwind
     end
 
     def zsuper(literal)
-      uw = get_unwind_label
       super
-      unwind uw
+      unwind
     end
   end
 end

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

@@ -770,8 +770,6 @@ module CodeTools
         location = @ip + 1
         @stream << 93 << arg1
         @ip += 2
-        arg1.used_at location
-        @current_block.add_stack(0, 0)
         @instruction = 93
       end
 

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

@@ -1,5 +1,5 @@
 module CodeTools
   class Compiler
-    VERSION = "3.17"
+    VERSION = "3.18"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubinius-compiler
 version: !ruby/object:Gem::Version
-  version: '3.17'
+  version: '3.18'
 platform: ruby
 authors:
 - Brian Shirai