Mercurial > hg > graal-compiler
changeset 487:80206b8a9128
6758234: if (k cond (a ? : b: c)) returns reversed answer if k is constant and b and c are longs
Reviewed-by: kvn, jrose
author | never |
---|---|
date | Fri, 12 Dec 2008 19:55:26 -0800 |
parents | a738a625039a |
children | 569b3b226089 2494ab195856 c6065343356f |
files | src/share/vm/c1/c1_Optimizer.cpp test/compiler/6758234/Test6758234.java |
diffstat | 2 files changed, 40 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/c1/c1_Optimizer.cpp Fri Dec 12 19:54:46 2008 -0800 +++ b/src/share/vm/c1/c1_Optimizer.cpp Fri Dec 12 19:55:26 2008 -0800 @@ -327,8 +327,6 @@ BlockBegin* fsux = if_->fsux(); if (swapped) { cond = Instruction::mirror(cond); - tsux = if_->fsux(); - fsux = if_->tsux(); } BlockBegin* tblock = tval->compare(cond, con, tsux, fsux);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/compiler/6758234/Test6758234.java Fri Dec 12 19:55:26 2008 -0800 @@ -0,0 +1,40 @@ +/* + * Copyright 2008 Sun Microsystems, 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 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + +/** + * @test + * @bug 6758234 + * @summary if (k cond (a ? : b: c)) returns reversed answer if k is constant and b and c are longs + * @run main/othervm -Xcomp -XX:CompileOnly=Test6758234.main Test6758234 + */ + +public class Test6758234 { + static int x = 0; + static int y = 1; + + public static void main(String[] args) { + if (1 != ((x < y) ? 1L : 0)) { + throw new InternalError(); + } + } +}