src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/alloc/SingleBlockTraceBuilder.java

*** 24,44 ****
  
  import java.util.ArrayList;
  
  import org.graalvm.compiler.core.common.alloc.TraceBuilderResult.TrivialTracePredicate;
  import org.graalvm.compiler.core.common.cfg.AbstractBlockBase;
  
  /**
   * Builds traces consisting of a single basic block.
   */
  public final class SingleBlockTraceBuilder {
  
!     public static TraceBuilderResult computeTraces(AbstractBlockBase<?> startBlock, AbstractBlockBase<?>[] blocks, TrivialTracePredicate pred) {
!         return build(startBlock, blocks, pred);
      }
  
!     private static TraceBuilderResult build(AbstractBlockBase<?> startBlock, AbstractBlockBase<?>[] blocks, TrivialTracePredicate pred) {
          Trace[] blockToTrace = new Trace[blocks.length];
          ArrayList<Trace> traces = new ArrayList<>(blocks.length);
  
          for (AbstractBlockBase<?> block : blocks) {
              Trace trace = new Trace(new AbstractBlockBase<?>[]{block});
--- 24,45 ----
  
  import java.util.ArrayList;
  
  import org.graalvm.compiler.core.common.alloc.TraceBuilderResult.TrivialTracePredicate;
  import org.graalvm.compiler.core.common.cfg.AbstractBlockBase;
+ import org.graalvm.compiler.debug.DebugContext;
  
  /**
   * Builds traces consisting of a single basic block.
   */
  public final class SingleBlockTraceBuilder {
  
!     public static TraceBuilderResult computeTraces(DebugContext debug, AbstractBlockBase<?> startBlock, AbstractBlockBase<?>[] blocks, TrivialTracePredicate pred) {
!         return build(debug, startBlock, blocks, pred);
      }
  
!     private static TraceBuilderResult build(DebugContext debug, AbstractBlockBase<?> startBlock, AbstractBlockBase<?>[] blocks, TrivialTracePredicate pred) {
          Trace[] blockToTrace = new Trace[blocks.length];
          ArrayList<Trace> traces = new ArrayList<>(blocks.length);
  
          for (AbstractBlockBase<?> block : blocks) {
              Trace trace = new Trace(new AbstractBlockBase<?>[]{block});
*** 47,55 ****
              trace.setId(traces.size());
              traces.add(trace);
          }
  
          assert traces.get(0).getBlocks()[0].equals(startBlock) : "The first traces always contains the start block";
!         return TraceBuilderResult.create(blocks, traces, blockToTrace, pred);
      }
  
  }
--- 48,56 ----
              trace.setId(traces.size());
              traces.add(trace);
          }
  
          assert traces.get(0).getBlocks()[0].equals(startBlock) : "The first traces always contains the start block";
!         return TraceBuilderResult.create(debug, blocks, traces, blockToTrace, pred);
      }
  
  }