Mercurial > hg > graal-compiler
changeset 10419:ac79c138e734
GraphBuilderPhase: handle locks properly during framestate merge
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Wed, 19 Jun 2013 23:46:55 +0200 |
parents | ff3c23a329ed |
children | 672e126cf996 |
files | graal/com.oracle.graal.java/src/com/oracle/graal/java/FrameStateBuilder.java graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/SynchronizedLoopExit01.java |
diffstat | 2 files changed, 64 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/FrameStateBuilder.java Wed Jun 19 20:24:27 2013 +0200 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/FrameStateBuilder.java Wed Jun 19 23:46:55 2013 +0200 @@ -172,6 +172,9 @@ for (int i = 0; i < stackSize(); i++) { storeStack(i, merge(stackAt(i), other.stackAt(i), block)); } + for (int i = 0; i < locks.length; i++) { + locks[i] = merge(locks[i], other.locks[i], block); + } } private ValueNode merge(ValueNode currentValue, ValueNode otherValue, MergeNode block) {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/SynchronizedLoopExit01.java Wed Jun 19 23:46:55 2013 +0200 @@ -0,0 +1,61 @@ +/* + * Copyright (c) 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 + * 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. + */ +/* + */ +package com.oracle.graal.jtt.threads; + +import org.junit.*; + +import com.oracle.graal.jtt.*; + +/** + * Inspired by {@code com.sun.media.sound.DirectAudioDevice$DirectDL.drain()}. + * + * Two loop exits hold a monitor while merging. + * + */ +public final class SynchronizedLoopExit01 extends JTTTest { + + protected Object object = new Object(); + protected volatile boolean drained = false; + protected volatile boolean someBoolean = true; + + public boolean test() { + boolean b = true; + while (!drained) { + synchronized (object) { + boolean c = b = someBoolean; + if (c || drained) { + break; + } + } + } + return b; + } + + @Test + public void run0() throws Throwable { + runTest("test"); + } + +}