Fix explosions when trying to sink typevars.

rakudo · Dec 9, 2012 · 63659db · 63659db
1 parent c481a55
commit 63659db
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/Perl6/Actions.pm b/src/Perl6/Actions.pm
@@ -56,13 +56,18 @@ class Perl6::Actions is HLL::Actions does STDActions {
                 ),
                 QAST::Op.new(:op<if>,
                     QAST::Op.new(:op<if>,
-                        QAST::Op.new(:op<defined>,
+                        QAST::Op.new(:op<isconcrete>,
                             QAST::Var.new(:$name, :scope<local>),
                         ),
-                        QAST::Op.new(:op<can>,
-                            QAST::Var.new(:$name, :scope<local>),
-                            QAST::SVal.new(:value('sink')),
-                        ),
+                        QAST::Op.new(:op<if>,
+                            QAST::Op.new(:op<can>,
+                                QAST::Var.new(:$name, :scope<local>),
+                                QAST::SVal.new(:value('sink')),
+                            ),
+                            QAST::Op.new(:op<defined>,
+                                QAST::Var.new(:$name, :scope<local>),
+                            )
+                        )
                     ),
                     QAST::Op.new(:op<callmethod>, :name<sink>,
                         QAST::Var.new(:$name, :scope<local>),

diff --git a/src/Perl6/Metamodel/GenericHOW.pm b/src/Perl6/Metamodel/GenericHOW.pm
@@ -34,7 +34,7 @@ class Perl6::Metamodel::GenericHOW
     }
 
     method find_method($obj, $name) {
-        nqp::die("Cannot call a method on type variable " ~ self.name($obj))
+        nqp::null()
     }
 
     method type_check($obj, $checkee) {