# HG changeset patch # User dlong # Date 1562694399 14400 # Node ID 10f1928a33b5b66df68df47098a7a920da62e6a2 # Parent 29e522153769a0e84de200d2805f5e476d01db37 8227237: [Graal] org.graalvm.compiler.api.directives.test.ProbabilityDirectiveTest fails with -Xcomp Reviewed-by: kvn diff -r 29e522153769 -r 10f1928a33b5 src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.directives.test/src/org/graalvm/compiler/api/directives/test/ProbabilityDirectiveTest.java --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.directives.test/src/org/graalvm/compiler/api/directives/test/ProbabilityDirectiveTest.java Tue Jul 09 16:39:41 2019 +0200 +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.directives.test/src/org/graalvm/compiler/api/directives/test/ProbabilityDirectiveTest.java Tue Jul 09 13:46:39 2019 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, 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 @@ -24,6 +24,8 @@ package org.graalvm.compiler.api.directives.test; +import jdk.vm.ci.meta.ResolvedJavaMethod; + import org.graalvm.compiler.api.directives.GraalDirectives; import org.graalvm.compiler.core.test.GraalCompilerTest; import org.graalvm.compiler.graph.iterators.NodeIterable; @@ -37,6 +39,15 @@ public class ProbabilityDirectiveTest extends GraalCompilerTest { + /** + * Called before a test is compiled. + */ + @Override + protected void before(ResolvedJavaMethod method) { + // don't let -Xcomp pollute profile + method.reprofile(); + } + public static int branchProbabilitySnippet(int arg) { if (GraalDirectives.injectBranchProbability(0.125, arg > 0)) { GraalDirectives.controlFlowAnchor(); // prevent removal of the if