Mercurial > hg > graal-compiler
changeset 11110:5f533e38e7d5
Merge
author | twisti |
---|---|
date | Tue, 09 Jul 2013 22:00:04 -0700 |
parents | b42fe1a8e180 (diff) 7ac80525ece9 (current diff) |
children | dec841e0c9aa |
files | |
diffstat | 2 files changed, 22 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/adlc/forms.hpp Tue Jul 09 11:48:05 2013 +0200 +++ b/src/share/vm/adlc/forms.hpp Tue Jul 09 22:00:04 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, 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 @@ -146,7 +146,7 @@ // Public Methods Form(int formType=0, int line=0) : _next(NULL), _linenum(line), _ftype(formType) { }; - ~Form() {}; + virtual ~Form() {}; virtual bool ideal_only() const { assert(0,"Check of ideal status on non-instruction/operand form.\n");
--- a/test/compiler/8005956/PolynomialRoot.java Tue Jul 09 11:48:05 2013 +0200 +++ b/test/compiler/8005956/PolynomialRoot.java Tue Jul 09 22:00:04 2013 -0700 @@ -15,7 +15,7 @@ * @bug 8005956 * @summary C2: assert(!def_outside->member(r)) failed: Use of external LRG overlaps the same LRG defined in this block * -* @run main PolynomialRoot +* @run main/timeout=300 PolynomialRoot */ public class PolynomialRoot { @@ -757,19 +757,26 @@ public static void main(final String [] args) { - final long t0=System.currentTimeMillis(); - final double eps=1e-6; - //checkRoots(); - final java.util.Random r=new java.util.Random(-1381923); - printSpecialValues(); + if (System.getProperty("os.arch").equals("x86") || + System.getProperty("os.arch").equals("amd64") || + System.getProperty("os.arch").equals("x86_64")){ + final long t0=System.currentTimeMillis(); + final double eps=1e-6; + //checkRoots(); + final java.util.Random r=new java.util.Random(-1381923); + printSpecialValues(); - final int n_tests=10000000; - //testRoots(2,n_tests,r,eps); - //testRoots(3,n_tests,r,eps); - testRoots(4,n_tests,r,eps); - final long t1=System.currentTimeMillis(); - System.err.println("PolynomialRoot.main: "+n_tests+" tests OK done in "+(t1-t0)+" milliseconds. ver=$Id: PolynomialRoot.java,v 1.105 2012/08/18 00:00:05 mal Exp $"); - } + final int n_tests=100000; + //testRoots(2,n_tests,r,eps); + //testRoots(3,n_tests,r,eps); + testRoots(4,n_tests,r,eps); + final long t1=System.currentTimeMillis(); + System.err.println("PolynomialRoot.main: "+n_tests+" tests OK done in "+(t1-t0)+" milliseconds. ver=$Id: PolynomialRoot.java,v 1.105 2012/08/18 00:00:05 mal Exp $"); + System.out.println("PASSED"); + } else { + System.out.println("PASS test for non-x86"); + } + }