[jvm] Make nqp::findmethod throw an exception if it can't find the method.

Author: pmurias

src/vm/jvm/runtime/org/perl6/nqp/runtime/IndyBootstrap.java

@@ -508,9 +508,6 @@ public static void methcallResolve_noa(Lookup caller, MutableCallSite cs, String
         /* Try to resolve method to a coderef. */
         SixModelObject invocant = (SixModelObject)args[0];
         SixModelObject invokee = Ops.findmethod(invocant, name, tc);
-        if (invokee == null)
-            throw ExceptionHandling.dieInternal(tc,
-                "Method '" + name + "' not found for invocant of class '" + Ops.typeName(invocant, tc) + "'");
         CodeRef cr;
         if (invokee instanceof CodeRef) {
             cr = (CodeRef)invokee;
@@ -573,9 +570,6 @@ public static void methcallCacheMono_noa(String name, CallSiteDescriptor csd,
         }
         else {
             SixModelObject invokee = Ops.findmethod(invocant, name, tc);
-            if (invokee == null)
-                throw ExceptionHandling.dieInternal(tc,
-                    "Method '" + name + "' not found for invocant of class '" + Ops.typeName(invocant, tc) + "'");
 
             if (invokee instanceof CodeRef) {
                 cr = (CodeRef)invokee;
@@ -640,9 +634,6 @@ public static void indmethcallInvoker_noa(MutableCallSite cs, int csIdx,
         /* Try to resolve method to a coderef. */
         SixModelObject invocant = (SixModelObject)args[0];
         SixModelObject invokee = Ops.findmethod(invocant, name, tc);
-        if (invokee == null)
-            throw ExceptionHandling.dieInternal(tc,
-                "Method '" + name + "' not found for invocant of class '" + Ops.typeName(invocant, tc) + "'");
         CodeRef cr;
         if (invokee instanceof CodeRef) {
             cr = (CodeRef)invokee;

src/vm/jvm/runtime/org/perl6/nqp/runtime/NativeCallOps.java

@@ -497,7 +497,7 @@ public static Object toJNAType(ThreadContext tc, SixModelObject o, ArgType targe
             /* TODO: Handle encodings. */
             o = Ops.decont(o, tc);
             if (Ops.isconcrete(o, tc) == 0) return null;
-            SixModelObject meth = Ops.findmethod(o, "cstr", tc);
+            SixModelObject meth = Ops.findmethodNonFatal(o, "cstr", tc);
             if (meth != null) {
                 Ops.invokeDirect(tc, meth, new CallSiteDescriptor(new byte[] { ARG_OBJ }, null), new Object[] { o });
                 CStrInstance cstr = (CStrInstance) Ops.decont(Ops.result_o(tc.resultFrame()), tc);

src/vm/jvm/runtime/org/perl6/nqp/runtime/Ops.java

@@ -2509,7 +2509,7 @@ public static SixModelObject hlllist(ThreadContext tc) {
     public static SixModelObject hllhash(ThreadContext tc) {
         return tc.curFrame.codeRef.staticInfo.compUnit.hllConfig.hashType;
     }
-    public static SixModelObject findmethod(ThreadContext tc, SixModelObject invocant, String name) {
+    public static SixModelObject findmethodInCache(ThreadContext tc, SixModelObject invocant, String name) {
         if (invocant == null)
             throw ExceptionHandling.dieInternal(tc, "Cannot call method '" + name + "' on a null object");
         invocant = decont(invocant, tc);
@@ -2521,6 +2521,13 @@ public static SixModelObject findmethod(ThreadContext tc, SixModelObject invocan
         return meth;
     }
     public static SixModelObject findmethod(SixModelObject invocant, String name, ThreadContext tc) {
+        SixModelObject method = findmethodNonFatal(invocant, name, tc);
+        if (method == null)
+                throw ExceptionHandling.dieInternal(tc,
+                    "Method '" + name + "' not found for invocant of class '" + typeName(invocant, tc) + "'");
+        return method;
+    }
+    public static SixModelObject findmethodNonFatal(SixModelObject invocant, String name, ThreadContext tc) {
         if (invocant == null)
             throw ExceptionHandling.dieInternal(tc, "Cannot call method '" + name + "' on a null object");
         invocant = decont(invocant, tc);
@@ -2546,12 +2553,12 @@ public static SixModelObject findmethod(SixModelObject invocant, String name, Th
     public static String typeName(SixModelObject invocant, ThreadContext tc) {
         invocant = decont(invocant, tc);
         SixModelObject how = invocant.st.HOW;
-        SixModelObject nameMeth = findmethod(tc, how, "name");
+        SixModelObject nameMeth = findmethodInCache(tc, how, "name");
         invokeDirect(tc, nameMeth, howObjCallSite, new Object[] { how, invocant });
         return result_s(tc.curFrame);
     }
     public static long can(SixModelObject invocant, String name, ThreadContext tc) {
-        return findmethod(invocant, name, tc) == null ? 0 : 1;
+        return findmethodNonFatal(invocant, name, tc) == null ? 0 : 1;
     }
     public static long eqaddr(SixModelObject a, SixModelObject b) {
         return a == b ? 1 : 0;
@@ -2656,7 +2663,7 @@ public static long istype_nodecont(SixModelObject obj, SixModelObject type, Thre
         /* If we get here, need to call .^type_check on the value we're
          * checking. */
         if (cache == null || (typeCheckMode & STable.TYPE_CHECK_CACHE_THEN_METHOD) != 0) {
-            SixModelObject tcMeth = findmethod(obj.st.HOW, "type_check", tc);
+            SixModelObject tcMeth = findmethodNonFatal(obj.st.HOW, "type_check", tc);
             if (tcMeth == null)
                 return 0;
                 /* TODO: Review why the following busts stuff. */
@@ -2675,7 +2682,7 @@ public static long istype_nodecont(SixModelObject obj, SixModelObject type, Thre
 
         /* If the flag to call .accepts_type on the target value is set, do so. */
         if ((typeCheckMode & STable.TYPE_CHECK_NEEDS_ACCEPTS) != 0) {
-            SixModelObject atMeth = findmethod(type.st.HOW, "accepts_type", tc);
+            SixModelObject atMeth = findmethodNonFatal(type.st.HOW, "accepts_type", tc);
             if (atMeth == null)
                 throw ExceptionHandling.dieInternal(tc,
                     "Expected accepts_type method, but none found in meta-object");

src/vm/jvm/runtime/org/perl6/nqp/sixmodel/reprs/CArray.java

@@ -41,7 +41,7 @@ public SixModelObject allocate(ThreadContext tc, STable st) {
     private void fillREPRData(ThreadContext tc, STable st) {
         CArrayREPRData data = new CArrayREPRData();
 
-        SixModelObject meth = Ops.findmethod(st.WHAT, "of", tc);
+        SixModelObject meth = Ops.findmethodNonFatal(st.WHAT, "of", tc);
         if (meth == null)
             ExceptionHandling.dieInternal(tc, "CArray representation expects an 'of' method, specifying the element type");