Multi cache should decontainerize before taking the type for JVM/Parrot consistency. Still a little dodgy because it assumes hashCode values are unique.

Author: sorear

src/vm/jvm/QAST/Compiler.nqp

@@ -1896,6 +1896,7 @@ QAST::OperationsJAST.map_classlib_core_op('rename', $TYPE_OPS, 'rename', [$RT_ST
 QAST::OperationsJAST.map_classlib_core_op('copy', $TYPE_OPS, 'copy', [$RT_STR, $RT_STR], $RT_INT);
 QAST::OperationsJAST.map_classlib_core_op('link', $TYPE_OPS, 'link', [$RT_STR, $RT_STR], $RT_INT);
 QAST::OperationsJAST.map_classlib_core_op('symlink', $TYPE_OPS, 'symlink', [$RT_STR, $RT_STR], $RT_INT);
+QAST::OperationsJAST.map_classlib_core_op('debugnoop', $TYPE_OPS, 'debugnoop', [$RT_OBJ], $RT_OBJ, :tc);
 
 # terms
 QAST::OperationsJAST.map_classlib_core_op('time_i', $TYPE_OPS, 'time_i', [], $RT_INT);

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

@@ -1511,12 +1511,12 @@ public static SixModelObject lexotic(long target) {
     public static SixModelObject multicacheadd(SixModelObject cache, SixModelObject capture, SixModelObject result, ThreadContext tc) {
         if (!(cache instanceof MultiCacheInstance))
             cache = tc.gc.MultiCache.st.REPR.allocate(tc, tc.gc.MultiCache.st);
-        ((MultiCacheInstance)cache).add((CallCaptureInstance)capture, result);
+        ((MultiCacheInstance)cache).add((CallCaptureInstance)capture, result, tc);
         return cache;
     }
     public static SixModelObject multicachefind(SixModelObject cache, SixModelObject capture, ThreadContext tc) {
         if (cache instanceof MultiCacheInstance)
-            return ((MultiCacheInstance)cache).lookup((CallCaptureInstance)capture);
+            return ((MultiCacheInstance)cache).lookup((CallCaptureInstance)capture, tc);
         else
             return null;
     }

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

@@ -1,6 +1,8 @@
 package org.perl6.nqp.sixmodel.reprs;
 
 import org.perl6.nqp.runtime.CallSiteDescriptor;
+import org.perl6.nqp.runtime.Ops;
+import org.perl6.nqp.runtime.ThreadContext;
 import org.perl6.nqp.sixmodel.SixModelObject;
 import org.perl6.nqp.sixmodel.TypeObject;
 
@@ -34,7 +36,7 @@ private class ArityCache
         public SixModelObject[] results;
     }
 
-    public void add(CallCaptureInstance capture, SixModelObject result) {
+    public void add(CallCaptureInstance capture, SixModelObject result, ThreadContext tc) {
         /* If there's flattenings, we can't cache. */
         if (capture.descriptor.hasFlattening)
             return;
@@ -71,7 +73,7 @@ public void add(CallCaptureInstance capture, SixModelObject result) {
             case CallSiteDescriptor.ARG_OBJ:
                 if (numArgs >= MD_CACHE_MAX_ARITY)
                     return;
-                long flag = ((long)((SixModelObject)args[i]).st.hashCode()) << 1;
+                long flag = ((long)Ops.decont((SixModelObject)args[i], tc).st.hashCode()) << 1;
                 if (!(args[i] instanceof TypeObject))
                     flag |= 1;
                 argTup[numArgs++] = flag;
@@ -107,7 +109,7 @@ public void add(CallCaptureInstance capture, SixModelObject result) {
         ac.numEntries++;
     }
 
-    public SixModelObject lookup(CallCaptureInstance capture) {
+    public SixModelObject lookup(CallCaptureInstance capture, ThreadContext tc) {
         /* If there's flattenings, we can't use the cache. */
         if (capture.descriptor.hasFlattening)
             return null;
@@ -138,7 +140,7 @@ public SixModelObject lookup(CallCaptureInstance capture) {
             case CallSiteDescriptor.ARG_OBJ:
                 if (numArgs >= MD_CACHE_MAX_ARITY)
                     return null;
-                long flag = ((long)((SixModelObject)args[i]).st.hashCode()) << 1;
+                long flag = ((long)Ops.decont((SixModelObject)args[i], tc).st.hashCode()) << 1;
                 if (!(args[i] instanceof TypeObject))
                     flag |= 1;
                 argTup[numArgs++] = flag;