# HG changeset patch # User Thomas Wuerthinger # Date 1376664599 -7200 # Node ID 41c5234a3f274e624214016c86d0b7015d315f19 # Parent 3384b4cf035705f59e09f0652ae14368e142952c# Parent 602a25aade245468eb60c4f52996bf552e530f1b Merge. diff -r 3384b4cf0357 -r 41c5234a3f27 graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/ProfilingInfo.java --- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/ProfilingInfo.java Fri Aug 16 16:44:14 2013 +0200 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/ProfilingInfo.java Fri Aug 16 16:49:59 2013 +0200 @@ -87,7 +87,8 @@ TriState getExceptionSeen(int bci); /** - * Returns information if null was ever seen for the given BCI. + * Returns information if null was ever seen for the given BCI. This information is collected + * for the aastore, checkcast and instanceof bytecodes. * * @return {@link TriState#TRUE} if null was seen for the instruction, {@link TriState#FALSE} if * null was NOT seen, and {@link TriState#UNKNOWN} if this information was not recorded. diff -r 3384b4cf0357 -r 41c5234a3f27 graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java --- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java Fri Aug 16 16:44:14 2013 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java Fri Aug 16 16:49:59 2013 +0200 @@ -363,11 +363,13 @@ protected Result executeActualCheckDeopt(Method method, Set shouldNotDeopt, Object receiver, Object... args) { Map deoptCounts = new EnumMap<>(DeoptimizationReason.class); - ProfilingInfo profile = runtime.lookupJavaMethod(method).getProfilingInfo(); + ResolvedJavaMethod javaMethod = runtime.lookupJavaMethod(method); + ProfilingInfo profile = javaMethod.getProfilingInfo(); for (DeoptimizationReason reason : shouldNotDeopt) { deoptCounts.put(reason, profile.getDeoptimizationCount(reason)); } Result actual = executeActual(method, receiver, args); + profile = javaMethod.getProfilingInfo(); // profile can change after execution for (DeoptimizationReason reason : shouldNotDeopt) { Assert.assertEquals((int) deoptCounts.get(reason), profile.getDeoptimizationCount(reason)); } diff -r 3384b4cf0357 -r 41c5234a3f27 graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java --- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java Fri Aug 16 16:44:14 2013 +0200 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java Fri Aug 16 16:49:59 2013 +0200 @@ -1137,9 +1137,12 @@ if (graphBuilderConfig.eagerResolving()) { returnType = returnType.resolve(targetMethod.getDeclaringClass()); } - if (invokeKind != InvokeKind.Static && invokeKind != InvokeKind.Special) { - JavaTypeProfile profile = profilingInfo.getTypeProfile(bci()); - args[0] = TypeProfileProxyNode.create(args[0], profile); + if (invokeKind != InvokeKind.Static) { + emitExplicitExceptions(args[0], null); + if (invokeKind != InvokeKind.Special) { + JavaTypeProfile profile = profilingInfo.getTypeProfile(bci()); + args[0] = TypeProfileProxyNode.create(args[0], profile); + } } MethodCallTargetNode callTarget = currentGraph.add(new MethodCallTargetNode(invokeKind, targetMethod, args, returnType)); createInvokeNode(callTarget, resultType); diff -r 3384b4cf0357 -r 41c5234a3f27 graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/ConditionalEliminiation01.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/ConditionalEliminiation01.java Fri Aug 16 16:49:59 2013 +0200 @@ -0,0 +1,78 @@ +/* + * Copyright (c) 2011, 2012, 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.optimize; + +import java.lang.reflect.*; +import java.util.*; + +import org.junit.*; + +import com.oracle.graal.test.*; +import com.oracle.graal.jtt.*; + +@SuppressWarnings("unused") +public class ConditionalEliminiation01 extends JTTTest { + + private static int x; + private static Object o = new Object(); + + private static class A { + + public A(int y) { + this.y = y; + } + + int y; + } + + @Override + protected void before(Method method) { + super.before(method); + x = 0; + } + + public int test(A a) { + if (o == null) { + return -1; + } + if (a == null) { + return -2; + } + if (o == null) { + return -3; + } + x = 3; + return a.y + x; + } + + @Test + public void run0() throws Throwable { + runTest("test", new A(5)); + } + + @Test + public void run1() throws Throwable { + runTest("test", new Object[]{null}); + } + +} diff -r 3384b4cf0357 -r 41c5234a3f27 graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/ConditionalEliminiation02.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/ConditionalEliminiation02.java Fri Aug 16 16:49:59 2013 +0200 @@ -0,0 +1,74 @@ +/* + * Copyright (c) 2011, 2012, 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.optimize; + +import java.lang.reflect.*; +import java.util.*; + +import org.junit.*; + +import com.oracle.graal.test.*; +import com.oracle.graal.api.meta.*; +import com.oracle.graal.jtt.*; + +@SuppressWarnings("unused") +public class ConditionalEliminiation02 extends JTTTest { + + private static Object o = null; + + private static class A { + + public A(int y) { + this.y = y; + } + + int y; + } + + public int test(A a, boolean isNull, boolean isVeryNull) { + if (o == null) { + if (!isNull) { + if (o == null) { + return a.y; + } + } + if (!isVeryNull) { + if (o == null) { + return a.y; + } + } + } + return -1; + } + + @Test + public void run0() throws Throwable { + runTest(EnumSet.of(DeoptimizationReason.NullCheckException), "test", new A(5), false, false); + } + + @Test + public void run1() throws Throwable { + runTest(EnumSet.of(DeoptimizationReason.NullCheckException), "test", new Object[]{null, true, true}); + } + +} diff -r 3384b4cf0357 -r 41c5234a3f27 graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConditionalEliminationPhase.java --- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConditionalEliminationPhase.java Fri Aug 16 16:44:14 2013 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConditionalEliminationPhase.java Fri Aug 16 16:49:59 2013 +0200 @@ -33,7 +33,7 @@ import com.oracle.graal.nodes.calc.*; import com.oracle.graal.nodes.extended.*; import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.java.MethodCallTargetNode.*; +import com.oracle.graal.nodes.java.MethodCallTargetNode.InvokeKind; import com.oracle.graal.nodes.type.*; import com.oracle.graal.nodes.util.*; import com.oracle.graal.phases.*; @@ -547,6 +547,10 @@ } if (replacement != null) { + if (replacementAnchor instanceof GuardNode) { + ValueAnchorNode anchor = graph.add(new ValueAnchorNode(replacementAnchor)); + graph.addBeforeFixed(ifNode, anchor); + } for (Node n : survivingSuccessor.usages().snapshot()) { if (n instanceof GuardNode || n instanceof ProxyNode) { // Keep wired to the begin node. @@ -555,7 +559,6 @@ // Cannot simplify this IfNode as there is no anchor. return; } - // Rewire to the replacement anchor. n.replaceFirstInput(survivingSuccessor, replacementAnchor); } diff -r 3384b4cf0357 -r 41c5234a3f27 mxtool/mx.py --- a/mxtool/mx.py Fri Aug 16 16:44:14 2013 +0200 +++ b/mxtool/mx.py Fri Aug 16 16:49:59 2013 +0200 @@ -3326,9 +3326,9 @@ Presents a command line interface for selecting one or more (if allowMultiple is true) items. """ - if len(items) == 0: - return [] - elif len(items) > 1: + if len(items) <= 1: + return items + else: if allowMultiple: log('[0] ') for i in range(0, len(items)):