Fix excessive decontainerization bug.

Fixes Rakudo spectest regressions resulting from indy work.
Raku · Dec 3, 2013 · 7805299 · 7805299
1 parent a620659
commit 7805299
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/vm/jvm/runtime/org/perl6/nqp/runtime/IndyBootstrap.java b/src/vm/jvm/runtime/org/perl6/nqp/runtime/IndyBootstrap.java
@@ -499,7 +499,7 @@ public static void methcallResolve_noa(Lookup caller, MutableCallSite cs, String
         boolean shared = tc.curFrame.codeRef.staticInfo.compUnit.shared;
 
         /* Try to resolve method to a coderef. */
-        SixModelObject invocant = Ops.decont((SixModelObject)args[0], tc);
+        SixModelObject invocant = (SixModelObject)args[0];
         SixModelObject invokee = Ops.findmethod(invocant, name, tc);
         if (invokee == null)
             throw ExceptionHandling.dieInternal(tc,
@@ -533,7 +533,8 @@ public static void methcallResolve_noa(Lookup caller, MutableCallSite cs, String
                     "methcallCacheMono_noa", resType);
                 cs.setTarget(MethodHandles
                     .dropArguments(
-                        MethodHandles.insertArguments(res, 1, csd, invocant.st, cr),
+                        MethodHandles.insertArguments(res, 1, csd,
+                            Ops.decont(invocant, tc).st, cr),
                         1, int.class)
                     .asCollector(Object[].class, cs.type().parameterCount() - 3)
                     .asType(cs.type()));