Streamline return value logic

- make Binder.get_return_type return nqp::null on Mu - make p6typecheckrv op to just emit the value if type is nqp::null effectively bypassing all typechecks if --> Mu - streamline the raku-rv-typecheck dispatcher - more comments - fast-path handling of Nil / Failure being returned - fewer checks on paths that need runtime / definite checks / coercion
rakudo · Feb 8, 2024 · ccbe370 · ccbe370
1 parent 02bc10c
commit ccbe370
Show file tree

Hide file tree

Showing 3 changed files with 209 additions and 163 deletions.
diff --git a/src/Perl6/bootstrap.c/BOOTSTRAP.nqp b/src/Perl6/bootstrap.c/BOOTSTRAP.nqp
@@ -1031,7 +1031,12 @@ my class Binder {
     }
 
     method get_return_type($code) {
-        nqp::getattr(nqp::getattr($code, Code, '$!signature'), Signature, '$!returns')
+        my $type := nqp::getattr(
+          nqp::getattr($code, Code, '$!signature'), Signature, '$!returns'
+        );
+        nqp::eqaddr($type,Mu) || nqp::eqaddr($type,NQPMu)
+          ?? nqp::null
+          !! $type
     }
 #?endif
 

diff --git a/src/vm/moar/Perl6/Ops.nqp b/src/vm/moar/Perl6/Ops.nqp
@@ -408,33 +408,28 @@ $ops.add_hll_op('Raku', 'p6box', -> $qastcomp, $op {
 });
 $ops.add_hll_op('Raku', 'p6typecheckrv', -> $qastcomp, $op {
     if nqp::istype($op[1], QAST::WVal) {
-        my $type := &get_binder().get_return_type($op[1].value);
-        if nqp::isnull($type) || nqp::objprimspec(nqp::decont($type)) {
-            $qastcomp.as_mast($op[0])
+        my $value := $op[0];
+        my $type  := &get_binder().get_return_type($op[1].value);
+        if nqp::isnull($type) {
+            $qastcomp.as_mast(QAST::Op.new(:op<p6box>, $value));
+        }
+        elsif nqp::objprimspec(nqp::decont($type)) {
+            $qastcomp.as_mast($value)
         }
         else {
             my $is_generic := $type.HOW.archetypes($type).generic;
-            my $type_ast;
-            if $is_generic {
-                $type_ast :=
-                    QAST::Op.new(
-                        :op<callmethod>,
-                        :name<instantiate_generic>,
-                        QAST::Op.new(:op<how>, QAST::WVal.new(:value($type))),
-                        QAST::WVal.new(:value($type)),
-                        QAST::Op.new(:op<curlexpad>)
-                    );
-            }
-            else {
-                $type_ast := QAST::WVal.new( :value($type) );
-            }
-            $qastcomp.as_mast(QAST::Op.new(
-                :op('dispatch'),
-                QAST::SVal.new( :value('raku-rv-typecheck') ),
-                QAST::Op.new( :op('p6box'), $op[0] ),
-                $type_ast,
-                QAST::IVal.new(:value($is_generic))
-            ))
+            $qastcomp.as_mast(QAST::Op.new(:op<dispatch>,
+              QAST::SVal.new( :value('raku-rv-typecheck') ),
+              QAST::Op.new( :op('p6box'), $value ),
+              $is_generic
+                ?? QAST::Op.new(:op<callmethod>, :name<instantiate_generic>,
+                     QAST::Op.new(:op<how>, QAST::WVal.new(:value($type))),
+                     QAST::WVal.new(:value($type)),
+                     QAST::Op.new(:op<curlexpad>)
+                   )
+                !! QAST::WVal.new(:value($type)),
+              QAST::IVal.new(:value($is_generic))
+            ));
         }
     }
     else {