Now nulls the ref to the args array for #1586 instead of clearing the array, so callee code has no copy responsibility (Phil Jenvey's suggestion). Backed out change to thread.PyLocal accordingly in r7047. Bumped bytecode magic.

jimbaker · jimbaker · commit 3d16cafcb284 · 2010-04-27T06:07:08.000Z
diff --git a/src/org/python/compiler/CodeCompiler.java b/src/org/python/compiler/CodeCompiler.java
@@ -413,6 +413,12 @@ public void freeArray(int array) {
         code.freeLocal(array);
     }
 
+    public void freeArrayRef(int array) {
+        code.aconst_null();
+        code.astore(array);
+        code.freeLocal(array);
+    }
+
     public Str getDocStr(java.util.List<stmt> suite) {
         if (suite.size() > 0) {
             stmt stmt = suite.get(0);
@@ -1811,7 +1817,7 @@ public Object visitCall(Call node) throws Exception {
             stackConsume(3); // target + starargs + kwargs
             code.invokevirtual(p(PyObject.class), "_callextra", sig(PyObject.class,
                     PyObject[].class, String[].class, PyObject.class, PyObject.class));
-            freeArray(argArray);
+            freeArrayRef(argArray);
         } else if (keys.size() > 0) {
             loadThreadState();
             stackProduce(p(ThreadState.class));
@@ -1823,7 +1829,7 @@ public Object visitCall(Call node) throws Exception {
             stackConsume(2); // target + ts
             code.invokevirtual(p(PyObject.class), "__call__", sig(PyObject.class, ThreadState.class,
                     PyObject[].class, String[].class));
-            freeArray(argArray);
+            freeArrayRef(argArray);
         } else {
             loadThreadState();
             stackProduce(p(ThreadState.class));
diff --git a/src/org/python/core/imp.java b/src/org/python/core/imp.java
@@ -21,7 +21,7 @@ public class imp {
 
     private static final String UNKNOWN_SOURCEFILE = "<unknown>";
 
-    private static final int APIVersion = 29;
+    private static final int APIVersion = 30;
 
     public static final int NO_MTIME = -1;
 
diff --git a/src/org/python/modules/thread/PyLocal.java b/src/org/python/modules/thread/PyLocal.java
@@ -59,9 +59,7 @@ final void _local___init__(PyObject[] args, String[] keywords) {
         if (where[0] == TYPE && args.length > 0) {
             throw Py.TypeError("Initialization arguments are not supported");
         }
-        // caller zeros out `args`
-        this.args = new PyObject[args.length];
-        System.arraycopy(args, 0, this.args, 0, args.length);
+        this.args = args;
         this.keywords = keywords;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -59,9 +59,7 @@ final void _local___init__(PyObject[] args, String[] keywords) {`
`59`	`59`	`if (where[0] == TYPE && args.length > 0) {`
`60`	`60`	`throw Py.TypeError("Initialization arguments are not supported");`
`61`	`61`	`}`
`62`		- // caller zeros out `args`
`63`		`- this.args = new PyObject[args.length];`
`64`		`- System.arraycopy(args, 0, this.args, 0, args.length);`
	`62`	`+ this.args = args;`
`65`	`63`	`this.keywords = keywords;`
`66`	`64`	`}`
`67`	`65`