*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.code/src/org/graalvm/compiler/code/CompilationResult.java	Mon Aug 28 14:09:37 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.code/src/org/graalvm/compiler/code/CompilationResult.java	Mon Aug 28 14:09:37 2017

*** 31,40 ****
--- 31,41 ----
  import java.util.Collection;
  import java.util.Collections;
  import java.util.List;
  import java.util.Objects;
  
+ import org.graalvm.compiler.core.common.CompilationIdentifier;
  import org.graalvm.compiler.graph.NodeSourcePosition;
  import org.graalvm.util.EconomicSet;
  
  import jdk.vm.ci.code.DebugInfo;
  import jdk.vm.ci.code.StackSlot;

*** 188,197 ****
--- 189,200 ----
  
      private StackSlot customStackArea = null;
  
      private final String name;
  
+     private final CompilationIdentifier compilationId;
+ 
      /**
       * The buffer containing the emitted machine code.
       */
      private byte[] targetCode;
  

*** 220,246 ****
--- 223,254 ----
  
      private boolean hasUnsafeAccess;
  
      private boolean isImmutablePIC;
  
!     public CompilationResult(CompilationIdentifier compilationId) {
!         this(null, false);
!         this(compilationId, compilationId.toString(CompilationIdentifier.Verbosity.NAME), false);
      }
  
!     public CompilationResult(CompilationIdentifier compilationId, String name) {
!         this(compilationId, name, false);
      }
  
!     public CompilationResult(CompilationIdentifier compilationId, boolean isImmutablePIC) {
!         this(compilationId, null, isImmutablePIC);
      }
  
!     public CompilationResult(CompilationIdentifier compilationId, String name, boolean isImmutablePIC) {
+         this.compilationId = compilationId;
          this.name = name;
          this.isImmutablePIC = isImmutablePIC;
      }
  
+     public CompilationResult(String name) {
+         this(null, name);
+     }
+ 
      @Override
      public int hashCode() {
          // CompilationResult instances should not be used as hash map keys
          throw new UnsupportedOperationException("hashCode");
      }

*** 264,273 ****
--- 272,282 ----
              if (this.entryBCI == that.entryBCI &&
                  Objects.equals(this.customStackArea, that.customStackArea) &&
                  this.totalFrameSize == that.totalFrameSize &&
                  this.targetCodeSize == that.targetCodeSize &&
                  Objects.equals(this.name, that.name) &&
+                 Objects.equals(this.compilationId, that.compilationId) &&
                  Objects.equals(this.annotations, that.annotations) &&
                  Objects.equals(this.dataSection, that.dataSection) &&
                  Objects.equals(this.exceptionHandlers, that.exceptionHandlers) &&
                  Objects.equals(this.dataPatches, that.dataPatches) &&
                  Objects.equals(this.infopoints, that.infopoints) &&

*** 668,677 ****
--- 677,690 ----
  
      public String getName() {
          return name;
      }
  
+     public CompilationIdentifier getCompilationId() {
+         return compilationId;
+     }
+ 
      public void setHasUnsafeAccess(boolean hasUnsafeAccess) {
          checkOpen();
          this.hasUnsafeAccess = hasUnsafeAccess;
      }