/hg/icedtea6: Fix for regression test hotspot/7020373, added mis...
ptisnovs at icedtea.classpath.org
ptisnovs at icedtea.classpath.org
Tue Jul 19 04:19:43 PDT 2011
changeset 50eeb180dd77 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=50eeb180dd77
author: ptisnovs
date: Tue Jul 19 13:19:30 2011 +0200
Fix for regression test hotspot/7020373, added missing source used
to create the reproducer, removed unecessary patch
patches/jtreg-7020373-add-ignore-tag.patch
diffstat:
ChangeLog | 10 +
Makefile.am | 4 +-
patches/jtreg-7020373-add-ignore-tag.patch | 9 -
patches/jtreg-hotspot-Test7020373-fix.patch | 185 ++++++++++++++++++++++++++++
4 files changed, 197 insertions(+), 11 deletions(-)
diffs (239 lines):
diff -r 406c0d434ca3 -r 50eeb180dd77 ChangeLog
--- a/ChangeLog Fri Jul 15 08:53:07 2011 -0400
+++ b/ChangeLog Tue Jul 19 13:19:30 2011 +0200
@@ -1,3 +1,13 @@
+2011-07-19 Marc Schoenefeld <mschoene at redhat.com>
+ Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * Makefile.am: added new patch
+ * patches/jtreg-hotspot-Test7020373-fix.patch:
+ Fix for regression test hotspot/7020373, added missing
+ source used to create the reproducer.
+ * patches/jtreg-7020373-add-ignore-tag.patch:
+ Removed because it is not longer needed.
+
2011-07-15 Denis Lila <dlila at redhat.com>
* Makefile.am: Added patch.
diff -r 406c0d434ca3 -r 50eeb180dd77 Makefile.am
--- a/Makefile.am Fri Jul 15 08:53:07 2011 -0400
+++ b/Makefile.am Tue Jul 19 13:19:30 2011 +0200
@@ -361,11 +361,11 @@
patches/openjdk/7036220-shark_llvm_29_headers.patch \
patches/openjdk/7029152-String_intrinsics_miss_optimization.patch \
patches/openjdk/6711682-JCheckBox_in_JTable_does_not_respond_to_click.patch \
- patches/jtreg-7020373-add-ignore-tag.patch \
patches/openjdk/6758179-D3D_AlphaComposite_is_applied_incorrectly.patch \
patches/jtreg-ConstructDeflaterInput-fix.patch \
patches/openjdk/6613904-GroupLayout_createParallelGroup_null_arg.patch \
- patches/openjdk/7049339-anyblit-broken.patch
+ patches/openjdk/7049339-anyblit-broken.patch \
+ patches/jtreg-hotspot-Test7020373-fix.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
diff -r 406c0d434ca3 -r 50eeb180dd77 patches/jtreg-7020373-add-ignore-tag.patch
--- a/patches/jtreg-7020373-add-ignore-tag.patch Fri Jul 15 08:53:07 2011 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
---- openjdk.orig/hotspot/test/runtime/7020373/Test7020373.sh 2011-07-08 15:04:32.000000000 +0200
-+++ openjdk/hotspot/test/runtime/7020373/Test7020373.sh 2011-07-08 15:01:13.000000000 +0200
-@@ -3,6 +3,7 @@
- ##
- ## @test
- ## @bug 7020373
-+## @ignore The original test contains binary jar-file
- ## @key cte_test
- ## @summary JSR rewriting can overflow memory address size variables
- ## @run shell Test7020373.sh
diff -r 406c0d434ca3 -r 50eeb180dd77 patches/jtreg-hotspot-Test7020373-fix.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/jtreg-hotspot-Test7020373-fix.patch Tue Jul 19 13:19:30 2011 +0200
@@ -0,0 +1,187 @@
+diff -Nu ./GenOOMCrashClass.java /mnt/jqa/jck/oom/GenOOMCrashClass.java
+--- /dev/null 1970-01-01 01:00:00.000000000 +0100
++++ openjdk/hotspot/test/runtime/7020373/GenOOMCrashClass.java 2011-07-15 16:23:04.373764000 +0200
+@@ -0,0 +1,157 @@
++/*
++ * Copyright (c) 2011, Red Hat Inc. All Rights Reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2, or (at your option)
++ * any later version.
++ *
++ * This code is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ */
++
++import java.applet.Applet;
++import java.io.IOException;
++
++import com.sun.org.apache.bcel.internal.Constants;
++import com.sun.org.apache.bcel.internal.generic.AALOAD;
++import com.sun.org.apache.bcel.internal.generic.ACONST_NULL;
++import com.sun.org.apache.bcel.internal.generic.ALOAD;
++import com.sun.org.apache.bcel.internal.generic.ArrayType;
++import com.sun.org.apache.bcel.internal.generic.ClassGen;
++import com.sun.org.apache.bcel.internal.generic.ConstantPoolGen;
++import com.sun.org.apache.bcel.internal.generic.GOTO;
++import com.sun.org.apache.bcel.internal.generic.ICONST;
++import com.sun.org.apache.bcel.internal.generic.IFEQ;
++import com.sun.org.apache.bcel.internal.generic.ILOAD;
++import com.sun.org.apache.bcel.internal.generic.INVOKESTATIC;
++import com.sun.org.apache.bcel.internal.generic.ISTORE;
++import com.sun.org.apache.bcel.internal.generic.InstructionHandle;
++import com.sun.org.apache.bcel.internal.generic.InstructionList;
++import com.sun.org.apache.bcel.internal.generic.JSR;
++import com.sun.org.apache.bcel.internal.generic.MethodGen;
++import com.sun.org.apache.bcel.internal.generic.RETURN;
++import com.sun.org.apache.bcel.internal.generic.Type;
++
++
++public class GenOOMCrashClass {
++
++ public static String genOOMCrashClass(int maxmeth, int nums/*String[] a*/) throws Exception {
++ String theClassFile = "OOMCrashClass"+nums+"_"+maxmeth;
++ ClassGen cg = new ClassGen(theClassFile, "java.applet.Applet",
++ "<generated>", Constants.ACC_PUBLIC | Constants.ACC_SUPER, null);
++ ConstantPoolGen cp = cg.getConstantPool(); // cg creates constant pool
++
++ // int br0 = cp.addClass("marc.schoenefeld.2008");
++
++ int br2 = cp.addMethodref("java.lang.Integer", "parseInt",
++ "(Ljava/lang/String;)I");
++
++ Type[] argtype = new Type[] {
++ new ArrayType(Type.STRING, 1)
++ };
++
++ for (int j = 0; j < maxmeth; j++) {
++
++ InstructionList il = new InstructionList();
++
++ String methodName = maxmeth == 1 ? "main" : "main" + j;
++ MethodGen mg = new MethodGen(Constants.ACC_STATIC
++ | Constants.ACC_PUBLIC,// access flags
++ Type.VOID, // return type
++ argtype, new String[] { "argv" }, // arg
++ // names
++ methodName, theClassFile, // method, class
++ il, cp);
++
++ il.append(new ALOAD(0));
++ il.append(new ICONST(0));
++ il.append(new AALOAD()); // load something unpredictable, no folding
++ // please
++
++ il.append(new INVOKESTATIC(br2));
++ il.append(new ISTORE(1));
++
++ GOTO gototail = new GOTO(null);
++
++ il.append(gototail);
++
++ InstructionHandle ret = il.append(new RETURN());
++ InstructionHandle ih = null;
++ for (int i = 0; i < nums; i++) {
++ ih = il.append(new ILOAD(1));
++ IFEQ ifeq = new IFEQ(null);
++ il.append(ifeq);
++
++ JSR jsr = new JSR(null);
++ GOTO next = new GOTO(null);
++
++ InstructionHandle h_jsr = il.append(jsr);
++ InstructionHandle h_goto = il.append(next);
++ InstructionHandle h_ret = il.append(new RETURN());
++
++ InstructionHandle danach = il.append(new ACONST_NULL());
++ jsr.setTarget(h_ret);
++ next.setTarget(danach);
++
++ il.append(new GOTO(ih));
++ ifeq.setTarget(ret);
++ ret = ih;
++ }
++
++ gototail.setTarget(ih);
++
++ mg.setMaxStack(Integer.MAX_VALUE); // Needed stack size
++
++ mg.setMaxLocals();
++ cg.addMethod(mg.getMethod());
++ }
++ /* Add public <init> method, i.e. empty constructor */
++ cg.addEmptyConstructor(Constants.ACC_PUBLIC);
++
++ /* Get JavaClass object and dump it to file. */
++ try {
++ System.out.println("dumping:"+theClassFile);
++ cg.getJavaClass().dump(theClassFile + ".class");
++ } catch (java.io.IOException e) {
++ System.err.println(e);
++ }
++ return theClassFile;
++ }
++
++ public static void main(String[] a) throws Exception {
++ int maxmeth_default = 250;
++ int nums_default = 20;
++ int maxmeth;
++ int nums;
++ try {
++ maxmeth = Integer.parseInt(a[0]);
++ }
++ catch (Exception e) {
++ maxmeth = maxmeth_default;
++ }
++ try {
++ nums = Integer.parseInt(a[1]);
++ }
++ catch (Exception e) {
++ nums = nums_default;
++ }
++ String classname = genOOMCrashClass(maxmeth,nums);
++ System.out.println("Generated");
++ // System.out.println(a[0]);
++ // System.out.println("Loading");
++
++ // long t = System.currentTimeMillis();
++ // Class g2 = Class.forName(classname);
++ // long u = System.currentTimeMillis();
++ // System.out.println(g2 + ":" + (u - t));
++ }
++
++}
+diff -Nu ./Test7020373.sh /mnt/jqa/jck/oom/Test7020373.sh
+--- openjdk.orig/hotspot/test/runtime/7020373/Test7020373.sh 2011-07-15 15:41:47.000000000 +0200
++++ openjdk/hotspot/test/runtime/7020373/Test7020373.sh 2011-07-15 16:37:04.696613000 +0200
+@@ -3,6 +3,7 @@
+ ##
+ ## @test
+ ## @bug 7020373
++## @ignore The original test contains binary jar-file
+ ## @key cte_test
+ ## @summary JSR rewriting can overflow memory address size variables
+ ## @run shell Test7020373.sh
+@@ -60,8 +60,13 @@
+
+ ${TESTJAVA}${FS}bin${FS}java ${BIT_FLAG} -version
+
+-${TESTJAVA}${FS}bin${FS}jar xvf ${TESTSRC}${FS}testcase.jar
++# first step: compile GenOOMCrash generator
++${TESTJAVA}${FS}bin${FS}javac GenOOMCrashClass.java
+
++# second step: run the generator to create test class
++${TESTJAVA}${FS}bin${FS}java GenOOMCrashClass 1 4000
++
++# third step: run the reproducer
+ ${TESTJAVA}${FS}bin${FS}java ${BIT_FLAG} OOMCrashClass4000_1 > test.out 2>&1
+
+ cat test.out
More information about the distro-pkg-dev
mailing list