# HG changeset patch # User never # Date 1319838292 25200 # Node ID eba044a722a42865a3a034be787b59aa97ec5042 # Parent f350490a45fd1e386782132305f45841fe0b7bef 7103261: crash with jittester on sparc Reviewed-by: iveresov, kvn diff -r f350490a45fd -r eba044a722a4 src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp --- a/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp Thu Oct 27 18:20:50 2011 -0700 +++ b/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp Fri Oct 28 14:44:52 2011 -0700 @@ -1116,7 +1116,7 @@ } else { __ set(value_hi, O7); } - offset = store(tmp, base, addr->disp() + hi_word_offset_in_bytes, T_INT, wide, false); + store(tmp, base, addr->disp() + hi_word_offset_in_bytes, T_INT, wide, false); break; } case T_OBJECT: { diff -r f350490a45fd -r eba044a722a4 test/compiler/7103261/Test7103261.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/compiler/7103261/Test7103261.java Fri Oct 28 14:44:52 2011 -0700 @@ -0,0 +1,107 @@ +/* + * Copyright (c) 2011, Oracle and/or its affiliates. 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 version 2 only, as + * published by the Free Software Foundation. + * + * 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 + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * 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. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +/** + * @test + * @bug 7103261 + * @summary crash with jittester on sparc + * + * @run main Test7103261 + */ + +// exercise implicit null checking in the compiler for various field types +public class Test7103261 { + static Test7103261 null_value; + static Test7103261 nonnull_value = new Test7103261(); + static Test7103261 nonnull_value2 = new Test7103261(); + + long l; + int i; + float f; + double d; + byte b; + char c; + short s; + boolean z; + + public static void main(String[] args) { + constantStore(); + valueTest(false); + valueTest(true); + } + static void constantStore() { + for (int field = 0; field < 8; field++) { + try { + Test7103261 o = nonnull_value; + for (int i = 0; i < 100000; i++) { + switch (field) { + case 0: o.l = 0; break; + case 1: o.i = 0; break; + case 2: o.f = 0; break; + case 3: o.d = 0; break; + case 4: o.b = 0; break; + case 5: o.c = 0; break; + case 6: o.s = 0; break; + case 7: o.z = false; break; + default: throw new InternalError(); + } + if (i == 90000) { + // hide nullness from optimizer + o = null_value; + } + } + } catch (NullPointerException npe) { + } + } + } + static void valueTest(boolean store) { + for (int field = 0; field < 8; field++) { + try { + Test7103261 o = nonnull_value; + Test7103261 o2 = nonnull_value2; + for (int i = 0; i < 100000; i++) { + switch (field) { + case 0: o.l = o2.l; break; + case 1: o.i = o2.i; break; + case 2: o.f = o2.f; break; + case 3: o.d = o2.d; break; + case 4: o.b = o2.b; break; + case 5: o.c = o2.c; break; + case 6: o.s = o2.s; break; + case 7: o.z = o2.z; break; + default: throw new InternalError(); + } + if (i == 90000) { + // hide nullness from optimizer + if (store) + o = null_value; + else + o2 = null_value; + } + } + } catch (NullPointerException npe) { + } + } + } +}