*** old/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/DataPatchProcessor.java	Tue Aug 22 11:46:48 2017
--- new/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/DataPatchProcessor.java	Tue Aug 22 11:46:48 2017

*** 1,7 ****
--- 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.

*** 30,40 ****
--- 30,39 ----
  import jdk.tools.jaotc.binformat.Relocation;
  import jdk.tools.jaotc.binformat.Relocation.RelocType;
  import jdk.tools.jaotc.binformat.Symbol;
  import jdk.tools.jaotc.binformat.Symbol.Binding;
  import jdk.tools.jaotc.binformat.Symbol.Kind;
  import jdk.tools.jaotc.AOTCompiledClass.AOTKlassData;
  import org.graalvm.compiler.code.DataSection;
  import org.graalvm.compiler.hotspot.meta.HotSpotConstantLoadAction;
  
  import jdk.vm.ci.code.TargetDescription;
  import jdk.vm.ci.code.site.ConstantReference;

*** 45,55 ****
--- 44,54 ----
  import jdk.vm.ci.hotspot.HotSpotObjectConstant;
  import jdk.vm.ci.hotspot.HotSpotResolvedObjectType;
  import jdk.vm.ci.hotspot.HotSpotSentinelConstant;
  import jdk.vm.ci.meta.VMConstant;
  
! final class DataPatchProcessor {
  
      private final TargetDescription target;
  
      private final BinaryContainer binaryContainer;
  

*** 87,99 ****
--- 86,98 ----
                  HotSpotResolvedObjectType type = metaspaceConstant.asResolvedJavaType();
                  targetSymbol = type.getName();
                  gotName = ((action == HotSpotConstantLoadAction.INITIALIZE) ? "got.init." : "got.") + targetSymbol;
                  methodInfo.addDependentKlassData(binaryContainer, type);
              } else if (metaspaceConstant.asResolvedJavaMethod() != null && action == HotSpotConstantLoadAction.LOAD_COUNTERS) {
!                 targetSymbol = "counters." + MiscUtils.uniqueMethodName(metaspaceConstant.asResolvedJavaMethod());
!                 targetSymbol = "counters." + JavaMethodInfo.uniqueMethodName(metaspaceConstant.asResolvedJavaMethod());
                  gotName = "got." + targetSymbol;
!                 binaryContainer.addMetaspaceSymbol(targetSymbol);
!                 binaryContainer.addCountersSymbol(targetSymbol);
              }
          } else if (constant instanceof HotSpotObjectConstant) {
              // String constant.
              HotSpotObjectConstant oopConstant = (HotSpotObjectConstant) constant;
              targetSymbol = "ldc." + oopConstant.toValueString();