src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/MarkProcessor.java

*** 1,7 ****
  /*
!  * Copyright (c) 2016, 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) 2016, 2017, 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.
*** 28,38 ****
  import jdk.tools.jaotc.binformat.Relocation.RelocType;
  import jdk.tools.jaotc.binformat.Symbol;
  
  import jdk.vm.ci.code.site.Mark;
  
! class MarkProcessor {
  
      private final BinaryContainer binaryContainer;
  
      MarkProcessor(DataBuilder dataBuilder) {
          binaryContainer = dataBuilder.getBinaryContainer();
--- 28,38 ----
  import jdk.tools.jaotc.binformat.Relocation.RelocType;
  import jdk.tools.jaotc.binformat.Symbol;
  
  import jdk.vm.ci.code.site.Mark;
  
! final class MarkProcessor {
  
      private final BinaryContainer binaryContainer;
  
      MarkProcessor(DataBuilder dataBuilder) {
          binaryContainer = dataBuilder.getBinaryContainer();
*** 63,97 ****
              case INLINE_CONTIGUOUS_ALLOCATION_SUPPORTED:
                  String vmSymbolName;
                  switch (markId) {
                      case POLL_FAR:
                      case POLL_RETURN_FAR:
!                         vmSymbolName = binaryContainer.getPollingPageSymbolName();
                          break;
                      case CARD_TABLE_ADDRESS:
!                         vmSymbolName = binaryContainer.getCardTableAddressSymbolName();
                          break;
                      case HEAP_TOP_ADDRESS:
!                         vmSymbolName = binaryContainer.getHeapTopAddressSymbolName();
                          break;
                      case HEAP_END_ADDRESS:
!                         vmSymbolName = binaryContainer.getHeapEndAddressSymbolName();
                          break;
                      case NARROW_KLASS_BASE_ADDRESS:
!                         vmSymbolName = binaryContainer.getNarrowKlassBaseAddressSymbolName();
                          break;
                      case NARROW_OOP_BASE_ADDRESS:
!                         vmSymbolName = binaryContainer.getNarrowOopBaseAddressSymbolName();
                          break;
                      case CRC_TABLE_ADDRESS:
!                         vmSymbolName = binaryContainer.getCrcTableAddressSymbolName();
                          break;
                      case LOG_OF_HEAP_REGION_GRAIN_BYTES:
!                         vmSymbolName = binaryContainer.getLogOfHeapRegionGrainBytesSymbolName();
                          break;
                      case INLINE_CONTIGUOUS_ALLOCATION_SUPPORTED:
!                         vmSymbolName = binaryContainer.getInlineContiguousAllocationSupportedSymbolName();
                          break;
                      default:
                          throw new InternalError("Unhandled mark: " + mark);
                  }
                  String s = "got." + vmSymbolName;
--- 63,97 ----
              case INLINE_CONTIGUOUS_ALLOCATION_SUPPORTED:
                  String vmSymbolName;
                  switch (markId) {
                      case POLL_FAR:
                      case POLL_RETURN_FAR:
!                         vmSymbolName = BinaryContainer.getPollingPageSymbolName();
                          break;
                      case CARD_TABLE_ADDRESS:
!                         vmSymbolName = BinaryContainer.getCardTableAddressSymbolName();
                          break;
                      case HEAP_TOP_ADDRESS:
!                         vmSymbolName = BinaryContainer.getHeapTopAddressSymbolName();
                          break;
                      case HEAP_END_ADDRESS:
!                         vmSymbolName = BinaryContainer.getHeapEndAddressSymbolName();
                          break;
                      case NARROW_KLASS_BASE_ADDRESS:
!                         vmSymbolName = BinaryContainer.getNarrowKlassBaseAddressSymbolName();
                          break;
                      case NARROW_OOP_BASE_ADDRESS:
!                         vmSymbolName = BinaryContainer.getNarrowOopBaseAddressSymbolName();
                          break;
                      case CRC_TABLE_ADDRESS:
!                         vmSymbolName = BinaryContainer.getCrcTableAddressSymbolName();
                          break;
                      case LOG_OF_HEAP_REGION_GRAIN_BYTES:
!                         vmSymbolName = BinaryContainer.getLogOfHeapRegionGrainBytesSymbolName();
                          break;
                      case INLINE_CONTIGUOUS_ALLOCATION_SUPPORTED:
!                         vmSymbolName = BinaryContainer.getInlineContiguousAllocationSupportedSymbolName();
                          break;
                      default:
                          throw new InternalError("Unhandled mark: " + mark);
                  }
                  String s = "got." + vmSymbolName;