Make UJIT.disasm accept Procs

XrXr · XrXr · commit 75511791937d · 2021-02-04T12:30:51.000-05:00
diff --git a/ujit.rb b/ujit.rb
@@ -1,8 +1,6 @@
 module UJIT
   def self.disasm(iseq)
-    if iseq.is_a? Method
-        iseq = RubyVM::InstructionSequence.of(iseq)
-    end
+    iseq = RubyVM::InstructionSequence.of(iseq)
 
     blocks = UJIT.blocks_for(iseq)
     return if blocks.empty?
diff --git a/ujit_iface.c b/ujit_iface.c
@@ -353,6 +353,9 @@ iseqw_ujit_collect_blocks(st_data_t key, st_data_t value, st_data_t argp)
 static VALUE
 ujit_blocks_for(VALUE mod, VALUE rb_iseq)
 {
+    if (!rb_obj_is_iseq(rb_iseq)) {
+        return rb_ary_new();
+    }
     const rb_iseq_t *iseq = rb_iseqw_to_iseq(rb_iseq);
     st_table * vt = (st_table *)version_tbl;
     struct ujit_block_itr itr;
@@ -367,6 +370,9 @@ ujit_blocks_for(VALUE mod, VALUE rb_iseq)
 static VALUE
 ujit_install_entry(VALUE mod, VALUE iseq)
 {
+    if (!rb_obj_is_iseq(iseq)) {
+	rb_raise(rb_eTypeError, "not an InstructionSequence");
+    }
     rb_ujit_compile_iseq(rb_iseqw_to_iseq(iseq));
     return iseq;
 }

Original file line number	Diff line number	Diff line change
`@@ -353,6 +353,9 @@ iseqw_ujit_collect_blocks(st_data_t key, st_data_t value, st_data_t argp)`
`353`	`353`	`static VALUE`
`354`	`354`	`ujit_blocks_for(VALUE mod, VALUE rb_iseq)`
`355`	`355`	`{`
	`356`	`+ if (!rb_obj_is_iseq(rb_iseq)) {`
	`357`	`+ return rb_ary_new();`
	`358`	`+ }`
`356`	`359`	`const rb_iseq_t *iseq = rb_iseqw_to_iseq(rb_iseq);`
`357`	`360`	`st_table * vt = (st_table *)version_tbl;`
`358`	`361`	`struct ujit_block_itr itr;`
`@@ -367,6 +370,9 @@ ujit_blocks_for(VALUE mod, VALUE rb_iseq)`
`367`	`370`	`static VALUE`
`368`	`371`	`ujit_install_entry(VALUE mod, VALUE iseq)`
`369`	`372`	`{`
	`373`	`+ if (!rb_obj_is_iseq(iseq)) {`
	`374`	`+ rb_raise(rb_eTypeError, "not an InstructionSequence");`
	`375`	`+ }`
`370`	`376`	`rb_ujit_compile_iseq(rb_iseqw_to_iseq(iseq));`
`371`	`377`	`return iseq;`
`372`	`378`	`}`