# HG changeset patch
# User Roland Schatz <roland.schatz@oracle.com>
# Date 1470992859 -7200
# Node ID 1140503536ae082daee2396f3aaa91c004a3ea80
# Parent  8b68d49fdad8750bfbf30c935a71d468fe9a6f2e
Backport style fixes and comments from jdk9.

diff -r 8b68d49fdad8 -r 1140503536ae jvmci/jdk.vm.ci.code/src/jdk/vm/ci/code/BytecodeFrame.java
--- a/jvmci/jdk.vm.ci.code/src/jdk/vm/ci/code/BytecodeFrame.java	Thu Aug 11 15:30:10 2016 +0200
+++ b/jvmci/jdk.vm.ci.code/src/jdk/vm/ci/code/BytecodeFrame.java	Fri Aug 12 11:07:39 2016 +0200
@@ -103,8 +103,8 @@
     public final boolean rethrowException;
 
     /**
-     * Specifies if this objects represents a frame state in the middle of executing a call. If
-     * true, the arguments to the call have been popped from the stack and the return value (for a
+     * Specifies if this object represents a frame state in the middle of executing a call. If true,
+     * the arguments to the call have been popped from the stack and the return value (for a
      * non-void call) has not yet been pushed.
      */
     public final boolean duringCall;
diff -r 8b68d49fdad8 -r 1140503536ae jvmci/jdk.vm.ci.code/src/jdk/vm/ci/code/CompiledCode.java
--- a/jvmci/jdk.vm.ci.code/src/jdk/vm/ci/code/CompiledCode.java	Thu Aug 11 15:30:10 2016 +0200
+++ b/jvmci/jdk.vm.ci.code/src/jdk/vm/ci/code/CompiledCode.java	Fri Aug 12 11:07:39 2016 +0200
@@ -24,7 +24,7 @@
 
 /**
  * Marker type for an object containing the output of a compiler in a form suitable for installing
- * into a managed code heap. Since the details of such are code are specific to each runtime, this
+ * into a managed code heap. Since the details of a code heap are specific to each runtime, this
  * interface does not specify any methods.
  */
 public interface CompiledCode {
diff -r 8b68d49fdad8 -r 1140503536ae jvmci/jdk.vm.ci.code/src/jdk/vm/ci/code/MemoryBarriers.java
--- a/jvmci/jdk.vm.ci.code/src/jdk/vm/ci/code/MemoryBarriers.java	Thu Aug 11 15:30:10 2016 +0200
+++ b/jvmci/jdk.vm.ci.code/src/jdk/vm/ci/code/MemoryBarriers.java	Fri Aug 12 11:07:39 2016 +0200
@@ -39,7 +39,7 @@
  * JMM's ReadAfterWrite.java test fails in -Xint mode without some kind of
  * memory barrier (i.e., it's not sufficient that the interpreter does not
  * reorder volatile references, the hardware also must not reorder them).
- * 
+ *
  * According to the new Java Memory Model (JMM):
  * (1) All volatiles are serialized wrt to each other.
  * ALSO reads &amp; writes act as acquire &amp; release, so:
@@ -50,7 +50,7 @@
  * that happen BEFORE the write float down to after the write.  It's OK for
  * non-volatile memory refs that happen after the volatile write to float up
  * before it.
- * 
+ *
  * We only put in barriers around volatile refs (they are expensive), not
  * _between_ memory refs (which would require us to track the flavor of the
  * previous memory refs).  Requirements (2) and (3) require some barriers
diff -r 8b68d49fdad8 -r 1140503536ae jvmci/jdk.vm.ci.code/src/jdk/vm/ci/code/site/Infopoint.java
--- a/jvmci/jdk.vm.ci.code/src/jdk/vm/ci/code/site/Infopoint.java	Thu Aug 11 15:30:10 2016 +0200
+++ b/jvmci/jdk.vm.ci.code/src/jdk/vm/ci/code/site/Infopoint.java	Fri Aug 12 11:07:39 2016 +0200
@@ -109,5 +109,4 @@
             }
         }
     }
-
 }
diff -r 8b68d49fdad8 -r 1140503536ae jvmci/jdk.vm.ci.code/src/jdk/vm/ci/code/site/InfopointReason.java
--- a/jvmci/jdk.vm.ci.code/src/jdk/vm/ci/code/site/InfopointReason.java	Thu Aug 11 15:30:10 2016 +0200
+++ b/jvmci/jdk.vm.ci.code/src/jdk/vm/ci/code/site/InfopointReason.java	Fri Aug 12 11:07:39 2016 +0200
@@ -26,6 +26,7 @@
  * A reason for infopoint insertion.
  */
 public enum InfopointReason {
+
     SAFEPOINT,
     CALL,
     IMPLICIT_EXCEPTION,
diff -r 8b68d49fdad8 -r 1140503536ae jvmci/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotRegisterConfig.java
--- a/jvmci/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotRegisterConfig.java	Thu Aug 11 15:30:10 2016 +0200
+++ b/jvmci/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotRegisterConfig.java	Fri Aug 12 11:07:39 2016 +0200
@@ -197,8 +197,7 @@
     public SPARCHotSpotRegisterConfig(TargetDescription target, RegisterArray allocatable) {
         this.target = target;
         this.allocatable = allocatable;
-        HashSet<Register> callerSaveSet = new HashSet<>();
-        target.arch.getAvailableValueRegisters().addTo(callerSaveSet);
+        HashSet<Register> callerSaveSet = new HashSet<>(target.arch.getAvailableValueRegisters().asList());
         for (Register cs : windowSaveRegisters) {
             callerSaveSet.remove(cs);
         }
diff -r 8b68d49fdad8 -r 1140503536ae jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java	Thu Aug 11 15:30:10 2016 +0200
+++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java	Fri Aug 12 11:07:39 2016 +0200
@@ -445,7 +445,7 @@
     native Object readUncompressedOop(long address);
 
     /**
-     * Specifies that {@code method} should not be inlined or compiled.
+     * Determines if {@code method} should not be inlined or compiled.
      */
     native void doNotInlineOrCompile(HotSpotResolvedJavaMethodImpl method);
 
diff -r 8b68d49fdad8 -r 1140503536ae jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java	Thu Aug 11 15:30:10 2016 +0200
+++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java	Fri Aug 12 11:07:39 2016 +0200
@@ -339,8 +339,7 @@
 
     @Override
     public boolean hasFinalizer() {
-        HotSpotVMConfig config = config();
-        return (getAccessFlags() & config.klassHasFinalizerFlag) != 0;
+        return (getAccessFlags() & config().klassHasFinalizerFlag) != 0;
     }
 
     @Override
diff -r 8b68d49fdad8 -r 1140503536ae jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfigStore.java
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfigStore.java	Thu Aug 11 15:30:10 2016 +0200
+++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfigStore.java	Fri Aug 12 11:07:39 2016 +0200
@@ -106,7 +106,7 @@
         try (InitTimer t = timer("CompilerToVm readConfiguration")) {
             data = compilerToVm.readConfiguration();
         }
-        assert data.length == 5;
+        assert data.length == 5 : data.length;
 
         // @formatter:off
         VMField[] vmFieldsInfo    = (VMField[]) data[0];
@@ -150,9 +150,4 @@
             }
         }
     }
-
-    @Override
-    public String toString() {
-        return getClass().getSimpleName();
-    }
 }
diff -r 8b68d49fdad8 -r 1140503536ae jvmci/jdk.vm.ci.meta/overview.html
--- a/jvmci/jdk.vm.ci.meta/overview.html	Thu Aug 11 15:30:10 2016 +0200
+++ b/jvmci/jdk.vm.ci.meta/overview.html	Fri Aug 12 11:07:39 2016 +0200
@@ -3,7 +3,7 @@
 <head>
 <!--
 
-Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2015, 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
diff -r 8b68d49fdad8 -r 1140503536ae jvmci/jdk.vm.ci.sparc/src/jdk/vm/ci/sparc/SPARCKind.java
--- a/jvmci/jdk.vm.ci.sparc/src/jdk/vm/ci/sparc/SPARCKind.java	Thu Aug 11 15:30:10 2016 +0200
+++ b/jvmci/jdk.vm.ci.sparc/src/jdk/vm/ci/sparc/SPARCKind.java	Fri Aug 12 11:07:39 2016 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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