src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EscapeAnalysisTest.java

rev 56282 : [mq]: graal

*** 1,7 ****
  /*
!  * Copyright (c) 2011, 2018, 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.
--- 1,7 ----
  /*
!  * Copyright (c) 2011, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 38,47 ****
--- 38,48 ----
  import org.graalvm.compiler.nodes.java.LoadFieldNode;
  import org.graalvm.compiler.nodes.virtual.AllocatedObjectNode;
  import org.graalvm.compiler.nodes.virtual.CommitAllocationNode;
  import org.graalvm.compiler.phases.common.CanonicalizerPhase;
  import org.graalvm.compiler.phases.schedule.SchedulePhase;
+ import org.graalvm.compiler.test.SubprocessUtil;
  import org.graalvm.compiler.virtual.phases.ea.PartialEscapePhase;
  import org.junit.Assert;
  import org.junit.Assume;
  import org.junit.Test;
  
*** 411,422 ****
       * This test makes sure that the allocation of a {@link Node} can be removed. It therefore also
       * tests the intrinsification of {@link Object#getClass()}.
       */
      @Test
      public void testNewNode() {
!         // Trackking of creation interferes with escape analysis
          Assume.assumeFalse(Node.TRACK_CREATION_POSITION);
          testEscapeAnalysis("testNewNodeSnippet", null, false);
      }
  
      private static final TestClassObject staticObj = new TestClassObject();
  
--- 412,426 ----
       * This test makes sure that the allocation of a {@link Node} can be removed. It therefore also
       * tests the intrinsification of {@link Object#getClass()}.
       */
      @Test
      public void testNewNode() {
!         // Tracking of creation interferes with escape analysis
          Assume.assumeFalse(Node.TRACK_CREATION_POSITION);
+         // JaCoco can add escaping allocations (e.g. allocation of coverage recording data
+         // structures)
+         Assume.assumeFalse("JaCoCo found -> skipping", SubprocessUtil.isJaCoCoAttached());
          testEscapeAnalysis("testNewNodeSnippet", null, false);
      }
  
      private static final TestClassObject staticObj = new TestClassObject();