Cloning of container lexicals (state to come).

Author: jnthn

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

@@ -110,8 +110,20 @@ public CallFrame(ThreadContext tc, CodeRef cr) {
         }
 
         // Set up lexical storage.
-        if (sci.oLexicalNames != null)
-            this.oLex = sci.oLexStatic.clone();
+        if (sci.oLexicalNames != null) {
+            int numoLex = sci.oLexStatic.length;
+            this.oLex = new SixModelObject[numoLex];
+            for (int i = 0; i < numoLex; i++) {
+                switch (sci.oLexStaticFlags[i]) {
+                case 0:
+                    this.oLex[i] = sci.oLexStatic[i];
+                    break;
+                default:
+                    this.oLex[i] = sci.oLexStatic[i].clone(tc);
+                    break;
+                }
+            }
+        }
         if (sci.iLexicalNames != null)
             this.iLex = new long[sci.iLexicalNames.length];
         if (sci.nLexicalNames != null)

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

@@ -143,7 +143,7 @@ public void setLexValues(ThreadContext tc, String uniqueId, String toParse) {
             if (idx == null)
                 new RuntimeException("Invalid lexical name '" + lexName + "' in static lexical installation");
             cr.staticInfo.oLexStatic[idx] = tc.gc.scs.get(handle).root_objects.get(scIdx);
-            /* XXX Process flags. */
+            cr.staticInfo.oLexStaticFlags[idx] = (byte)flags;
         }
      }
 

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

@@ -41,6 +41,11 @@ public class StaticCodeInfo implements Cloneable {
      */
     public SixModelObject[] oLexStatic;
 
+    /**
+     * Flags for each static lexical usage.
+     */
+    public byte[] oLexStaticFlags;
+    
     /**
      * Names of the lexicals we have of each of the base types.
      */
@@ -130,15 +135,19 @@ public StaticCodeInfo(CompilationUnit compUnit, MethodHandle mh,
         this.sLexicalNames = sLexicalNames;
         this.handlers = handlers;
         this.staticCode = staticCode;
-        if (oLexicalNames != null)
+        if (oLexicalNames != null) {
             this.oLexStatic = new SixModelObject[oLexicalNames.length];
+            this.oLexStaticFlags = new byte[oLexicalNames.length];
+        }
     }
 
     public StaticCodeInfo clone() {
         try {
             StaticCodeInfo result = (StaticCodeInfo)super.clone();
-            if (result.oLexStatic != null)
+            if (result.oLexStatic != null) {
                 result.oLexStatic = result.oLexStatic.clone();
+                result.oLexStaticFlags = result.oLexStaticFlags.clone();
+            }
             return result;
         }
         catch (Exception e) {