Addressed issue #3049886 (jython generates NPE with eager compilation) by...

Addressed issue #3049886 (jython generates NPE with eager compilation) by updating to latest release (Jython 2.5.2).

benchmarks/bms/jython/build.xml

@@ -11,8 +11,8 @@
     <property file="dacapo.properties"/>
 
     <property name="bm-name" value="jython"/>
-    <property name="bm-svn-url" value="https://jython.svn.sourceforge.net/svnroot/jython/tags/Release_2_5_1/jython"/>
-    <property name="bm-svn-revision" value="6571"/> <!-- 2.5.0 -->
+    <property name="bm-svn-url" value="https://jython.svn.sourceforge.net/svnroot/jython/tags/Release_2_5_2/jython"/>
+    <property name="bm-svn-revision" value="7206"/> <!-- 2.5.2 -->
     <property name="bm-version" value="svn-${bm-svn-revision}"/>
     <property name="bm-ignore-failure" value="yes" />
     <property name="bm-src" value="${bm-name}-src-${bm-version}.tar.gz"/>
@@ -25,6 +25,8 @@
 
     <property name="antlr-version" value="3.1.3"/>
     <property name="asm-version" value="3.1"/>
+    <property name="guava-version" value="r07"/>
+    <property name="jline-version" value="0.9.95-SNAPSHOT"/>
 
     <import file="../common.xml"/>
     <import file="pybench.xml"/>
@@ -51,9 +53,11 @@
         <copy file="${bm-build-dir}/dist/javalib/antlr-${antlr-version}.jar" todir="${bm-jars}"/>
         <copy file="${bm-build-dir}/dist/javalib/asm-${asm-version}.jar" todir="${bm-jars}"/>
         <copy file="${bm-build-dir}/dist/javalib/asm-commons-${asm-version}.jar" todir="${bm-jars}"/>
-        <copy file="${bm-build-dir}/dist/javalib/constantine-0.4.jar" todir="${bm-jars}"/>
-        <copy file="${bm-build-dir}/dist/javalib/jna-posix.jar" todir="${bm-jars}"/>
-        <copy file="${bm-build-dir}/dist/javalib/jna.jar" todir="${bm-jars}"/>
+        <copy file="${bm-build-dir}/dist/javalib/constantine.jar" todir="${bm-jars}"/>
+        <copy file="${bm-build-dir}/dist/javalib/guava-${guava-version}.jar" todir="${bm-jars}"/>
+        <copy file="${bm-build-dir}/dist/javalib/jaffl.jar" todir="${bm-jars}"/>
+        <copy file="${bm-build-dir}/dist/javalib/jline-${jline-version}.jar" todir="${bm-jars}"/>
+        <copy file="${bm-build-dir}/dist/javalib/jnr-posix.jar" todir="${bm-jars}"/>
     </target>
 
     <target name="data" depends="pybench">

benchmarks/bms/jython/jython.cnf

 benchmark jython
   class org.dacapo.harness.Jython
   thread-model single
-  jars "jython.jar", "antlr-3.1.3.jar", "asm-3.1.jar", "asm-commons-3.1.jar", "constantine-0.4.jar", "jna-posix.jar", "jna.jar";
+  jars "jython.jar", "antlr-3.1.3.jar", "asm-3.1.jar", "asm-commons-3.1.jar", "constantine.jar", "guava-r07.jar", "jaffl.jar", "jline-0.9.95-SNAPSHOT.jar", "jnr-posix.jar";
 
 size small args "${SCRATCH}/jython/sieve.py","50"
   output stdout digest 0xda39a3ee5e6b4b0d3255bfef95601890afd80709,

benchmarks/bms/jython/jython.patch

@@ -2,7 +2,7 @@ Only in src: java
 diff -ur ../clean/src/org/python/core/PySystemState.java src/org/python/core/PySystemState.java
 --- ../clean/src/org/python/core/PySystemState.java	2009-06-14 21:51:38.000000000 +1000
 +++ src/org/python/core/PySystemState.java	2009-06-16 22:15:24.000000000 +1000
-@@ -952,6 +952,11 @@
+@@ -975,6 +975,11 @@
         packageManager = new SysPackageManager(pkgdir, props);
     }