changeset 24602:3a678007b324

[GR-9336] Require Override annotations. PullRequest: graal-jvmci-8/46
author Tom Rodriguez <tom.rodriguez@oracle.com>
date Fri, 13 Apr 2018 16:22:28 -0700
parents 1c615c1a3f3a 09b86bc11936
children 90250d37250a 05795f95d893 787da0dbcc79
files
diffstat 44 files changed, 202 insertions(+), 44 deletions(-) [+]
line wrap: on
line diff
--- a/jvmci/jdk.vm.ci.aarch64/src/jdk/vm/ci/aarch64/AArch64Kind.java	Fri Apr 06 10:17:26 2018 -0700
+++ b/jvmci/jdk.vm.ci.aarch64/src/jdk/vm/ci/aarch64/AArch64Kind.java	Fri Apr 13 16:22:28 2018 -0700
@@ -71,14 +71,17 @@
         return scalar;
     }
 
+    @Override
     public int getSizeInBytes() {
         return size;
     }
 
+    @Override
     public int getVectorLength() {
         return vectorLength;
     }
 
+    @Override
     public Key getKey() {
         return key;
     }
@@ -116,6 +119,7 @@
         }
     }
 
+    @Override
     public char getTypeChar() {
         switch (this) {
             case BYTE:
--- a/jvmci/jdk.vm.ci.amd64/src/jdk/vm/ci/amd64/AMD64Kind.java	Fri Apr 06 10:17:26 2018 -0700
+++ b/jvmci/jdk.vm.ci.amd64/src/jdk/vm/ci/amd64/AMD64Kind.java	Fri Apr 13 16:22:28 2018 -0700
@@ -92,14 +92,17 @@
         return scalar;
     }
 
+    @Override
     public int getSizeInBytes() {
         return size;
     }
 
+    @Override
     public int getVectorLength() {
         return vectorLength;
     }
 
+    @Override
     public Key getKey() {
         return key;
     }
@@ -161,6 +164,7 @@
         }
     }
 
+    @Override
     public char getTypeChar() {
         switch (this) {
             case BYTE:
--- a/jvmci/jdk.vm.ci.code/src/jdk/vm/ci/code/CodeUtil.java	Fri Apr 06 10:17:26 2018 -0700
+++ b/jvmci/jdk.vm.ci.code/src/jdk/vm/ci/code/CodeUtil.java	Fri Apr 13 16:22:28 2018 -0700
@@ -377,6 +377,7 @@
 
     public static class NumberedRefMapFormatter implements RefMapFormatter {
 
+        @Override
         public String formatStackSlot(int frameRefMapIndex) {
             return "s" + frameRefMapIndex;
         }
--- a/jvmci/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterArray.java	Fri Apr 06 10:17:26 2018 -0700
+++ b/jvmci/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterArray.java	Fri Apr 13 16:22:28 2018 -0700
@@ -78,6 +78,7 @@
         return registers.clone();
     }
 
+    @Override
     public Iterator<Register> iterator() {
         return Arrays.asList(registers).iterator();
     }
--- a/jvmci/jdk.vm.ci.common/src/jdk/vm/ci/common/InitTimer.java	Fri Apr 06 10:17:26 2018 -0700
+++ b/jvmci/jdk.vm.ci.common/src/jdk/vm/ci/common/InitTimer.java	Fri Apr 13 16:22:28 2018 -0700
@@ -46,6 +46,7 @@
         System.out.println("START: " + SPACES.substring(0, n * 2) + name);
     }
 
+    @Override
     @SuppressFBWarnings(value = "ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD", justification = "only the initializing thread accesses this field")
     public void close() {
         final long end = System.currentTimeMillis();
--- a/jvmci/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotJVMCIBackendFactory.java	Fri Apr 06 10:17:26 2018 -0700
+++ b/jvmci/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotJVMCIBackendFactory.java	Fri Apr 13 16:22:28 2018 -0700
@@ -88,6 +88,7 @@
         return "JVMCIBackend:" + getArchitecture();
     }
 
+    @Override
     @SuppressWarnings("try")
     public JVMCIBackend createJVMCIBackend(HotSpotJVMCIRuntimeProvider runtime, JVMCIBackend host) {
 
--- a/jvmci/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotRegisterConfig.java	Fri Apr 06 10:17:26 2018 -0700
+++ b/jvmci/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotRegisterConfig.java	Fri Apr 13 16:22:28 2018 -0700
@@ -176,6 +176,7 @@
         return callerSaved;
     }
 
+    @Override
     public RegisterArray getCalleeSaveRegisters() {
         return null;
     }
--- a/jvmci/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotJVMCIBackendFactory.java	Fri Apr 06 10:17:26 2018 -0700
+++ b/jvmci/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotJVMCIBackendFactory.java	Fri Apr 13 16:22:28 2018 -0700
@@ -148,6 +148,7 @@
         return "JVMCIBackend:" + getArchitecture();
     }
 
+    @Override
     @SuppressWarnings("try")
     public JVMCIBackend createJVMCIBackend(HotSpotJVMCIRuntimeProvider runtime, JVMCIBackend host) {
         assert host == null;
--- a/jvmci/jdk.vm.ci.hotspot.jfr/src/jdk/vm/ci/hotspot/jfr/events/JFREventProvider.java	Fri Apr 06 10:17:26 2018 -0700
+++ b/jvmci/jdk.vm.ci.hotspot.jfr/src/jdk/vm/ci/hotspot/jfr/events/JFREventProvider.java	Fri Apr 13 16:22:28 2018 -0700
@@ -128,30 +128,37 @@
         @com.oracle.jrockit.jfr.ValueDefinition(name = "Compiled Code Size", contentType = com.oracle.jrockit.jfr.ContentType.Bytes) public int codeSize;
         @com.oracle.jrockit.jfr.ValueDefinition(name = "Inlined Code Size", contentType = com.oracle.jrockit.jfr.ContentType.Bytes) public int inlinedBytes;
 
+        @Override
         public void setMethod(String method) {
             this.method = method;
         }
 
+        @Override
         public void setCompileId(int id) {
             this.compileId = id;
         }
 
+        @Override
         public void setCompileLevel(int compileLevel) {
             this.compileLevel = (short) compileLevel;
         }
 
+        @Override
         public void setSucceeded(boolean succeeded) {
             this.succeeded = succeeded;
         }
 
+        @Override
         public void setIsOsr(boolean isOsr) {
             this.isOsr = isOsr;
         }
 
+        @Override
         public void setCodeSize(int codeSize) {
             this.codeSize = codeSize;
         }
 
+        @Override
         public void setInlinedBytes(int inlinedBytes) {
             this.inlinedBytes = inlinedBytes;
         }
@@ -177,10 +184,12 @@
         @com.oracle.jrockit.jfr.ValueDefinition(name = "Compilation ID", relationKey = "COMP_ID") public int compileId;
         @com.oracle.jrockit.jfr.ValueDefinition(name = "Message", description = "The failure message") public String failure;
 
+        @Override
         public void setCompileId(int id) {
             this.compileId = id;
         }
 
+        @Override
         public void setMessage(String message) {
             this.failure = message;
         }
--- a/jvmci/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotJVMCIBackendFactory.java	Fri Apr 06 10:17:26 2018 -0700
+++ b/jvmci/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotJVMCIBackendFactory.java	Fri Apr 13 16:22:28 2018 -0700
@@ -139,6 +139,7 @@
         return "JVMCIBackend:" + getArchitecture();
     }
 
+    @Override
     @SuppressWarnings("try")
     public JVMCIBackend createJVMCIBackend(HotSpotJVMCIRuntimeProvider runtime, JVMCIBackend host) {
         assert host == null;
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/EmptyEventProvider.java	Fri Apr 06 10:17:26 2018 -0700
+++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/EmptyEventProvider.java	Fri Apr 13 16:22:28 2018 -0700
@@ -38,45 +38,56 @@
     }
 
     static class EmptyCompilationEvent implements CompilationEvent {
+        @Override
         public void commit() {
             throw shouldNotReachHere();
         }
 
+        @Override
         public boolean shouldWrite() {
             // Events of this class should never been written.
             return false;
         }
 
+        @Override
         public void begin() {
         }
 
+        @Override
         public void end() {
         }
 
+        @Override
         public void setMethod(String method) {
             throw shouldNotReachHere();
         }
 
+        @Override
         public void setCompileId(int compileId) {
             throw shouldNotReachHere();
         }
 
+        @Override
         public void setCompileLevel(int compileLevel) {
             throw shouldNotReachHere();
         }
 
+        @Override
         public void setSucceeded(boolean succeeded) {
             throw shouldNotReachHere();
         }
 
+        @Override
         public void setIsOsr(boolean isOsr) {
             throw shouldNotReachHere();
         }
 
+        @Override
         public void setCodeSize(int codeSize) {
             throw shouldNotReachHere();
         }
 
+        @Override
         public void setInlinedBytes(int inlinedBytes) {
             throw shouldNotReachHere();
         }
@@ -88,19 +99,23 @@
     }
 
     static class EmptyCompilerFailureEvent implements CompilerFailureEvent {
+        @Override
         public void commit() {
             throw shouldNotReachHere();
         }
 
+        @Override
         public boolean shouldWrite() {
             // Events of this class should never been written.
             return false;
         }
 
+        @Override
         public void setCompileId(int compileId) {
             throw shouldNotReachHere();
         }
 
+        @Override
         public void setMessage(String message) {
             throw shouldNotReachHere();
         }
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCodeCacheProvider.java	Fri Apr 06 10:17:26 2018 -0700
+++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCodeCacheProvider.java	Fri Apr 13 16:22:28 2018 -0700
@@ -99,6 +99,7 @@
         return installedCode;
     }
 
+    @Override
     public InstalledCode installCode(ResolvedJavaMethod method, CompiledCode compiledCode, InstalledCode installedCode, SpeculationLog log, boolean isDefault) {
         InstalledCode resultInstalledCode;
         if (installedCode == null) {
@@ -136,6 +137,7 @@
         return logOrDump(resultInstalledCode, compiledCode);
     }
 
+    @Override
     public void invalidateInstalledCode(InstalledCode installedCode) {
         runtime.getCompilerToVM().invalidateInstalledCode(installedCode);
     }
@@ -152,14 +154,17 @@
         return null;
     }
 
+    @Override
     public SpeculationLog createSpeculationLog() {
         return new HotSpotSpeculationLog();
     }
 
+    @Override
     public long getMaxCallTargetOffset(long address) {
         return runtime.getCompilerToVM().getMaxCallTargetOffset(address);
     }
 
+    @Override
     public boolean shouldDebugNonSafepoints() {
         return runtime.getCompilerToVM().shouldDebugNonSafepoints();
     }
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCompilationRequestResult.java	Fri Apr 06 10:17:26 2018 -0700
+++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCompilationRequestResult.java	Fri Apr 13 16:22:28 2018 -0700
@@ -58,6 +58,7 @@
         this.inlinedBytecodes = inlinedBytecodes;
     }
 
+    @Override
     public Object getFailure() {
         return failureMessage;
     }
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCompressedNullConstant.java	Fri Apr 06 10:17:26 2018 -0700
+++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCompressedNullConstant.java	Fri Apr 13 16:22:28 2018 -0700
@@ -36,6 +36,7 @@
     private HotSpotCompressedNullConstant() {
     }
 
+    @Override
     public JavaKind getJavaKind() {
         return JavaKind.Object;
     }
@@ -50,10 +51,12 @@
         return true;
     }
 
+    @Override
     public Constant compress() {
         throw new IllegalArgumentException();
     }
 
+    @Override
     public Constant uncompress() {
         return NULL_POINTER;
     }
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantPool.java	Fri Apr 06 10:17:26 2018 -0700
+++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantPool.java	Fri Apr 13 16:22:28 2018 -0700
@@ -271,6 +271,7 @@
         return metaspaceConstantPool;
     }
 
+    @Override
     public long getMetaspacePointer() {
         return getMetaspaceConstantPool();
     }
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantReflectionProvider.java	Fri Apr 06 10:17:26 2018 -0700
+++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantReflectionProvider.java	Fri Apr 13 16:22:28 2018 -0700
@@ -50,6 +50,7 @@
         this.memoryAccess = new HotSpotMemoryAccessProviderImpl(runtime);
     }
 
+    @Override
     public MethodHandleAccessProvider getMethodHandleAccess() {
         return methodHandleAccess;
     }
@@ -167,6 +168,7 @@
         return JavaConstant.forBoxedPrimitive(((HotSpotObjectConstantImpl) source).object());
     }
 
+    @Override
     public JavaConstant forString(String value) {
         return HotSpotObjectConstantImpl.forObject(value);
     }
@@ -192,6 +194,7 @@
         return null;
     }
 
+    @Override
     public JavaConstant readFieldValue(ResolvedJavaField field, JavaConstant receiver) {
         HotSpotResolvedJavaField hotspotField = (HotSpotResolvedJavaField) field;
         if (hotspotField.isStatic()) {
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCICompilerConfig.java	Fri Apr 06 10:17:26 2018 -0700
+++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCICompilerConfig.java	Fri Apr 13 16:22:28 2018 -0700
@@ -53,6 +53,7 @@
             this.reason = reason;
         }
 
+        @Override
         public CompilationRequestResult compileMethod(CompilationRequest request) {
             throw new JVMCIError("No JVMCI compiler selected. " + reason);
         }
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIMetaAccessContext.java	Fri Apr 06 10:17:26 2018 -0700
+++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIMetaAccessContext.java	Fri Apr 13 16:22:28 2018 -0700
@@ -201,6 +201,7 @@
             return head;
         }
 
+        @Override
         public Iterator<T> iterator() {
             return new ChunkIterator<>();
         }
@@ -238,10 +239,12 @@
                 return result;
             }
 
+            @Override
             public boolean hasNext() {
                 return next != null;
             }
 
+            @Override
             public V next() {
                 V result = next;
                 next = findNext();
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java	Fri Apr 06 10:17:26 2018 -0700
+++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java	Fri Apr 13 16:22:28 2018 -0700
@@ -334,22 +334,27 @@
         return backend;
     }
 
+    @Override
     public ResolvedJavaType fromClass(Class<?> javaClass) {
         return metaAccessContext.fromClass(javaClass);
     }
 
+    @Override
     public HotSpotVMConfigStore getConfigStore() {
         return configStore;
     }
 
+    @Override
     public HotSpotVMConfig getConfig() {
         return config;
     }
 
+    @Override
     public CompilerToVM getCompilerToVM() {
         return compilerToVm;
     }
 
+    @Override
     public JVMCICompiler getCompiler() {
         if (compiler == null) {
             synchronized (this) {
@@ -361,6 +366,7 @@
         return compiler;
     }
 
+    @Override
     public JavaType lookupType(String name, HotSpotResolvedObjectType accessingType, boolean resolve) {
         Objects.requireNonNull(accessingType, "cannot resolve type without an accessing class");
         // If the name represents a primitive type we can short-circuit the lookup.
@@ -384,10 +390,12 @@
         }
     }
 
+    @Override
     public JVMCIBackend getHostJVMCIBackend() {
         return hostBackend;
     }
 
+    @Override
     public <T extends Architecture> JVMCIBackend getJVMCIBackend(Class<T> arch) {
         assert arch != Architecture.class;
         return backends.get(arch);
@@ -495,6 +503,7 @@
         }
     }
 
+    @Override
     public OutputStream getLogStream() {
         return new OutputStream() {
 
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaAccessProvider.java	Fri Apr 06 10:17:26 2018 -0700
+++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaAccessProvider.java	Fri Apr 13 16:22:28 2018 -0700
@@ -58,6 +58,7 @@
         this.runtime = runtime;
     }
 
+    @Override
     public ResolvedJavaType lookupJavaType(Class<?> clazz) {
         if (clazz == null) {
             throw new IllegalArgumentException("Class parameter was null");
@@ -65,6 +66,7 @@
         return runtime.fromClass(clazz);
     }
 
+    @Override
     public HotSpotResolvedObjectType lookupJavaType(JavaConstant constant) {
         if (constant.isNull() || !(constant instanceof HotSpotObjectConstant)) {
             return null;
@@ -72,14 +74,17 @@
         return ((HotSpotObjectConstant) constant).getType();
     }
 
+    @Override
     public Signature parseMethodDescriptor(String signature) {
         return new HotSpotSignature(runtime, signature);
     }
 
+    @Override
     public ResolvedJavaMethod lookupJavaMethod(Executable reflectionMethod) {
         return runtime.getCompilerToVM().asResolvedJavaMethod(Objects.requireNonNull(reflectionMethod));
     }
 
+    @Override
     public ResolvedJavaField lookupJavaField(Field reflectionField) {
         Class<?> fieldHolder = reflectionField.getDeclaringClass();
 
@@ -120,6 +125,7 @@
         return c;
     }
 
+    @Override
     public DeoptimizationReason decodeDeoptReason(JavaConstant constant) {
         HotSpotVMConfig config = runtime.getConfig();
         int reasonValue = ((~constant.asInt()) >> config.deoptimizationReasonShift) & intMaskRight(config.deoptimizationReasonBits);
@@ -127,6 +133,7 @@
         return reason;
     }
 
+    @Override
     public DeoptimizationAction decodeDeoptAction(JavaConstant constant) {
         HotSpotVMConfig config = runtime.getConfig();
         int actionValue = ((~constant.asInt()) >> config.deoptimizationActionShift) & intMaskRight(config.deoptimizationActionBits);
@@ -134,6 +141,7 @@
         return action;
     }
 
+    @Override
     public int decodeDebugId(JavaConstant constant) {
         HotSpotVMConfig config = runtime.getConfig();
         return ((~constant.asInt()) >> config.deoptimizationDebugIdShift) & intMaskRight(config.deoptimizationDebugIdBits);
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaspaceConstantImpl.java	Fri Apr 06 10:17:26 2018 -0700
+++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaspaceConstantImpl.java	Fri Apr 13 16:22:28 2018 -0700
@@ -73,14 +73,17 @@
         return toValueString();
     }
 
+    @Override
     public boolean isDefaultForKind() {
         return false;
     }
 
+    @Override
     public boolean isCompressed() {
         return compressed;
     }
 
+    @Override
     public Constant compress() {
         assert !isCompressed();
         HotSpotMetaspaceConstantImpl res = HotSpotMetaspaceConstantImpl.forMetaspaceObject(metaspaceObject, true);
@@ -88,6 +91,7 @@
         return res;
     }
 
+    @Override
     public Constant uncompress() {
         assert isCompressed();
         HotSpotMetaspaceConstantImpl res = HotSpotMetaspaceConstantImpl.forMetaspaceObject(metaspaceObject, false);
@@ -95,6 +99,7 @@
         return res;
     }
 
+    @Override
     public HotSpotResolvedObjectType asResolvedJavaType() {
         if (metaspaceObject instanceof HotSpotResolvedObjectType) {
             return (HotSpotResolvedObjectType) metaspaceObject;
@@ -102,6 +107,7 @@
         return null;
     }
 
+    @Override
     public HotSpotResolvedJavaMethod asResolvedJavaMethod() {
         if (metaspaceObject instanceof HotSpotResolvedJavaMethod) {
             return (HotSpotResolvedJavaMethod) metaspaceObject;
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethod.java	Fri Apr 06 10:17:26 2018 -0700
+++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethod.java	Fri Apr 13 16:22:28 2018 -0700
@@ -73,6 +73,7 @@
         return format(fmt);
     }
 
+    @Override
     public void formatTo(Formatter formatter, int flags, int width, int precision) {
         String base = (flags & ALTERNATE) == ALTERNATE ? getName() : toString();
         formatter.format(applyFormattingFlagsAndWidth(base, flags & ~ALTERNATE, width));
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodUnresolved.java	Fri Apr 06 10:17:26 2018 -0700
+++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodUnresolved.java	Fri Apr 13 16:22:28 2018 -0700
@@ -41,6 +41,7 @@
         this.signature = signature;
     }
 
+    @Override
     public String getName() {
         return name;
     }
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotObjectConstant.java	Fri Apr 06 10:17:26 2018 -0700
+++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotObjectConstant.java	Fri Apr 13 16:22:28 2018 -0700
@@ -36,8 +36,10 @@
  */
 public interface HotSpotObjectConstant extends JavaConstant, HotSpotConstant, VMConstant {
 
+    @Override
     JavaConstant compress();
 
+    @Override
     JavaConstant uncompress();
 
     /**
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotObjectConstantImpl.java	Fri Apr 06 10:17:26 2018 -0700
+++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotObjectConstantImpl.java	Fri Apr 13 16:22:28 2018 -0700
@@ -91,24 +91,29 @@
         return object;
     }
 
+    @Override
     public boolean isCompressed() {
         return compressed;
     }
 
+    @Override
     public JavaConstant compress() {
         assert !compressed;
         return new HotSpotObjectConstantImpl(object, true);
     }
 
+    @Override
     public JavaConstant uncompress() {
         assert compressed;
         return new HotSpotObjectConstantImpl(object, false);
     }
 
+    @Override
     public HotSpotResolvedObjectType getType() {
         return fromObjectClass(object.getClass());
     }
 
+    @Override
     public JavaConstant getClassLoader() {
         if (object instanceof Class) {
             /*
@@ -120,10 +125,12 @@
         return null;
     }
 
+    @Override
     public int getIdentityHashCode() {
         return System.identityHashCode(object);
     }
 
+    @Override
     public JavaConstant getComponentType() {
         if (object instanceof Class) {
             return HotSpotObjectConstantImpl.forObject(((Class<?>) object).getComponentType());
@@ -131,6 +138,7 @@
         return null;
     }
 
+    @Override
     public JavaConstant getSuperclass() {
         if (object instanceof Class) {
             return HotSpotObjectConstantImpl.forObject(((Class<?>) object).getSuperclass());
@@ -138,6 +146,7 @@
         return null;
     }
 
+    @Override
     public JavaConstant getCallSiteTarget(Assumptions assumptions) {
         if (object instanceof CallSite) {
             CallSite callSite = (CallSite) object;
@@ -153,6 +162,7 @@
         return null;
     }
 
+    @Override
     @SuppressFBWarnings(value = "ES_COMPARING_STRINGS_WITH_EQ", justification = "reference equality is what we want")
     public boolean isInternedString() {
         if (object instanceof String) {
@@ -162,6 +172,7 @@
         return false;
     }
 
+    @Override
     public <T> T asObject(Class<T> type) {
         if (type.isInstance(object)) {
             return type.cast(object);
@@ -169,6 +180,7 @@
         return null;
     }
 
+    @Override
     public Object asObject(ResolvedJavaType type) {
         if (type.isInstance(this)) {
             return object;
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaFieldImpl.java	Fri Apr 06 10:17:26 2018 -0700
+++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaFieldImpl.java	Fri Apr 13 16:22:28 2018 -0700
@@ -94,6 +94,7 @@
      * @return true iff this is a non-static field and its declaring class is assignable from
      *         {@code object}'s class
      */
+    @Override
     public boolean isInObject(Object object) {
         if (isStatic()) {
             return false;
@@ -127,6 +128,7 @@
         return type;
     }
 
+    @Override
     public int offset() {
         return offset;
     }
@@ -146,6 +148,7 @@
      *
      * @return true if field has {@link Stable} annotation, false otherwise
      */
+    @Override
     public boolean isStable() {
         return (config().jvmAccFieldStable & modifiers) != 0;
     }
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethod.java	Fri Apr 06 10:17:26 2018 -0700
+++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethod.java	Fri Apr 13 16:22:28 2018 -0700
@@ -40,6 +40,7 @@
      */
     boolean isCallerSensitive();
 
+    @Override
     HotSpotResolvedObjectType getDeclaringClass();
 
     /**
@@ -84,6 +85,7 @@
      */
     boolean hasCompiledCodeAtLevel(int level);
 
+    @Override
     default boolean isDefault() {
         if (isConstructor()) {
             return false;
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java	Fri Apr 06 10:17:26 2018 -0700
+++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java	Fri Apr 13 16:22:28 2018 -0700
@@ -22,24 +22,6 @@
  */
 package jdk.vm.ci.hotspot;
 
-import static jdk.vm.ci.hotspot.CompilerToVM.compilerToVM;
-import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.runtime;
-import static jdk.vm.ci.hotspot.HotSpotModifiers.BRIDGE;
-import static jdk.vm.ci.hotspot.HotSpotModifiers.SYNTHETIC;
-import static jdk.vm.ci.hotspot.HotSpotModifiers.VARARGS;
-import static jdk.vm.ci.hotspot.HotSpotModifiers.jvmMethodModifiers;
-import static jdk.vm.ci.hotspot.HotSpotVMConfig.config;
-import static jdk.vm.ci.hotspot.UnsafeAccess.UNSAFE;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Executable;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.Type;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
 import jdk.vm.ci.common.JVMCIError;
 import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.Option;
 import jdk.vm.ci.meta.Constant;
@@ -58,6 +40,24 @@
 import jdk.vm.ci.meta.SpeculationLog;
 import jdk.vm.ci.meta.TriState;
 
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Executable;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.Type;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+import static jdk.vm.ci.hotspot.CompilerToVM.compilerToVM;
+import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.runtime;
+import static jdk.vm.ci.hotspot.HotSpotModifiers.BRIDGE;
+import static jdk.vm.ci.hotspot.HotSpotModifiers.SYNTHETIC;
+import static jdk.vm.ci.hotspot.HotSpotModifiers.VARARGS;
+import static jdk.vm.ci.hotspot.HotSpotModifiers.jvmMethodModifiers;
+import static jdk.vm.ci.hotspot.HotSpotVMConfig.config;
+import static jdk.vm.ci.hotspot.UnsafeAccess.UNSAFE;
+
 /**
  * Implementation of {@link JavaMethod} for resolved HotSpot methods.
  */
@@ -147,6 +147,7 @@
         return UNSAFE.getAddress(metaspaceMethod + config().methodConstMethodOffset);
     }
 
+    @Override
     public String getName() {
         if (nameCache == null) {
             final int nameIndex = UNSAFE.getChar(getConstMethod() + config().constMethodNameIndexOffset);
@@ -203,6 +204,7 @@
         return HotSpotMetaspaceConstantImpl.forMetaspaceObject(this, false);
     }
 
+    @Override
     public long getMetaspacePointer() {
         return metaspaceMethod;
     }
@@ -295,6 +297,7 @@
      *
      * @return true if CallerSensitive annotation present, false otherwise
      */
+    @Override
     public boolean isCallerSensitive() {
         return (getFlags() & config().methodFlagsCallerSensitive) != 0;
     }
@@ -304,6 +307,7 @@
      *
      * @return true if ForceInline annotation present, false otherwise
      */
+    @Override
     public boolean isForceInline() {
         return (getFlags() & config().methodFlagsForceInline) != 0;
     }
@@ -313,6 +317,7 @@
      *
      * @return true if ReservedStackAccess annotation present, false otherwise
      */
+    @Override
     public boolean hasReservedStackAccess() {
         // Annotation isn't available in JDK8
         return false;
@@ -321,6 +326,7 @@
     /**
      * Sets flags on {@code method} indicating that it should never be inlined or compiled.
      */
+    @Override
     public void setNotInlinableOrCompilable() {
         compilerToVM().setNotInlinableOrCompilable(this);
     }
@@ -331,6 +337,7 @@
      *
      * @return true if special method ignored by security stack walks, false otherwise
      */
+    @Override
     public boolean ignoredBySecurityStackWalk() {
         return compilerToVM().methodIsIgnoredBySecurityStackWalk(this);
     }
@@ -385,6 +392,7 @@
         return compilerToVM().getStackTraceElement(this, bci);
     }
 
+    @Override
     public ResolvedJavaMethod uniqueConcreteMethod(HotSpotResolvedObjectType receiver) {
         if (receiver.isInterface()) {
             // Cannot trust interfaces. Because of:
@@ -424,6 +432,7 @@
      *
      * @return true if this method has compiled code, false otherwise
      */
+    @Override
     public boolean hasCompiledCode() {
         return getCompiledCode() != 0L;
     }
@@ -432,6 +441,7 @@
      * @param level
      * @return true if the currently installed code was generated at {@code level}.
      */
+    @Override
     public boolean hasCompiledCodeAtLevel(int level) {
         long compiledCode = getCompiledCode();
         if (compiledCode != 0) {
@@ -522,6 +532,7 @@
         return javaMethod == null ? null : javaMethod.getAnnotation(annotationClass);
     }
 
+    @Override
     public boolean isBridge() {
         return (BRIDGE & getModifiers()) != 0;
     }
@@ -531,10 +542,12 @@
         return (SYNTHETIC & getModifiers()) != 0;
     }
 
+    @Override
     public boolean isVarArgs() {
         return (VARARGS & getModifiers()) != 0;
     }
 
+    @Override
     public boolean isDefault() {
         // Copied from java.lang.Method.isDefault()
         int mask = Modifier.ABSTRACT | Modifier.PUBLIC | Modifier.STATIC;
@@ -674,6 +687,7 @@
      *
      * @return the offset of this method into the v-table
      */
+    @Override
     public int vtableEntryOffset(ResolvedJavaType resolved) {
         if (!isInVirtualMethodTable(resolved)) {
             throw new JVMCIError("%s does not have a vtable entry in type %s", this, resolved);
@@ -741,6 +755,7 @@
         }
     };
 
+    @Override
     public SpeculationLog getSpeculationLog() {
         Map<Long, SpeculationLog> map = SpeculationLogs.get(holder.mirror());
         synchronized (map) {
@@ -753,12 +768,14 @@
         }
     }
 
+    @Override
     public int intrinsicId() {
         HotSpotVMConfig config = config();
         // Important: Size of field changed, JDK8 has u1 and JDK9 u2
         return UNSAFE.getByte(metaspaceMethod + config.methodIntrinsicIdOffset) & 0xff;
     }
 
+    @Override
     public boolean isIntrinsicCandidate() {
         return true;
     }
@@ -769,10 +786,12 @@
      * @param entryBCI entry bci
      * @return compile id
      */
+    @Override
     public int allocateCompileId(int entryBCI) {
         return compilerToVM().allocateCompileId(this, entryBCI);
     }
 
+    @Override
     public boolean hasCodeAtLevel(int entryBCI, int level) {
         if (entryBCI == config().invocationEntryBci) {
             return hasCompiledCodeAtLevel(level);
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectType.java	Fri Apr 06 10:17:26 2018 -0700
+++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectType.java	Fri Apr 13 16:22:28 2018 -0700
@@ -45,24 +45,32 @@
         return HotSpotResolvedObjectTypeImpl.fromObjectClass(javaClass);
     }
 
+    @Override
     HotSpotResolvedObjectType getArrayClass();
 
+    @Override
     ResolvedJavaType getComponentType();
 
+    @Override
     AssumptionResult<ResolvedJavaType> findLeafConcreteSubtype();
 
+    @Override
     HotSpotResolvedObjectType getSuperclass();
 
+    @Override
     HotSpotResolvedObjectType[] getInterfaces();
 
     HotSpotResolvedObjectType getSupertype();
 
+    @Override
     HotSpotResolvedObjectType findLeastCommonAncestor(ResolvedJavaType otherType);
 
+    @Override
     default boolean isPrimitive() {
         return false;
     }
 
+    @Override
     default JavaKind getJavaKind() {
         return JavaKind.Object;
     }
@@ -103,8 +111,10 @@
 
     int layoutHelper();
 
+    @Override
     HotSpotResolvedObjectType getEnclosingType();
 
+    @Override
     ResolvedJavaMethod getClassInitializer();
 
     /**
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java	Fri Apr 06 10:17:26 2018 -0700
+++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java	Fri Apr 13 16:22:28 2018 -0700
@@ -296,6 +296,7 @@
         return compilerToVM().getImplementor(this);
     }
 
+    @Override
     public HotSpotResolvedObjectTypeImpl getSupertype() {
         if (isArray()) {
             ResolvedJavaType componentType = getComponentType();
@@ -447,6 +448,7 @@
         return compilerToVM().resolveMethod(this, hotSpotMethod, hotSpotCallerType);
     }
 
+    @Override
     public HotSpotConstantPool getConstantPool() {
         if (constantPool == null || !isArray() && UNSAFE.getAddress(getMetaspaceKlass() + config().instanceKlassConstantsOffset) != constantPool.getMetaspaceConstantPool()) {
             /*
@@ -465,6 +467,7 @@
      * allocated, then the returned value is negative (its absolute value gives the size). Must not
      * be called if this is an array or interface type.
      */
+    @Override
     public int instanceSize() {
         assert !isArray();
         assert !isInterface();
@@ -482,6 +485,7 @@
         return needsSlowPath ? -size : size;
     }
 
+    @Override
     public int layoutHelper() {
         HotSpotVMConfig config = config();
         return UNSAFE.getInt(getMetaspaceKlass() + config.klassLayoutHelperOffset);
@@ -522,6 +526,7 @@
         }
     }
 
+    @Override
     public int getVtableLength() {
         HotSpotVMConfig config = config();
         if (isInterface() || isArray()) {
@@ -795,6 +800,7 @@
      * {@linkplain HotSpotJVMCIRuntime#lookupType(String, HotSpotResolvedObjectType, boolean)
      * re-resolving} the type.
      */
+    @Override
     public boolean isDefinitelyResolvedWithRespectTo(ResolvedJavaType accessingClass) {
         assert accessingClass != null;
         ResolvedJavaType elementType = getElementalType();
@@ -825,19 +831,23 @@
     /**
      * Gets the metaspace Klass boxed in a {@link JavaConstant}.
      */
+    @Override
     public Constant klass() {
         return HotSpotMetaspaceConstantImpl.forMetaspaceObject(this, false);
     }
 
+    @Override
     public boolean isPrimaryType() {
         return config().secondarySuperCacheOffset != superCheckOffset();
     }
 
+    @Override
     public int superCheckOffset() {
         HotSpotVMConfig config = config();
         return UNSAFE.getInt(getMetaspaceKlass() + config.superCheckOffsetOffset);
     }
 
+    @Override
     public long prototypeMarkWord() {
         HotSpotVMConfig config = config();
         if (isArray()) {
@@ -917,6 +927,7 @@
         return result;
     }
 
+    @Override
     public ResolvedJavaMethod getClassInitializer() {
         if (!isArray()) {
             return compilerToVM().getClassInitializer(this);
@@ -934,6 +945,7 @@
         return (getAccessFlags() & config().jvmAccIsCloneable) != 0;
     }
 
+    @Override
     public long getFingerprint() {
         return 0L;
     }
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedPrimitiveType.java	Fri Apr 06 10:17:26 2018 -0700
+++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedPrimitiveType.java	Fri Apr 13 16:22:28 2018 -0700
@@ -74,6 +74,7 @@
         return HotSpotResolvedObjectTypeImpl.fromObjectClass(javaArrayMirror);
     }
 
+    @Override
     public ResolvedJavaType getElementalType() {
         return this;
     }
@@ -128,6 +129,7 @@
         return true;
     }
 
+    @Override
     public boolean isLinked() {
         return true;
     }
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotSentinelConstant.java	Fri Apr 06 10:17:26 2018 -0700
+++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotSentinelConstant.java	Fri Apr 13 16:22:28 2018 -0700
@@ -24,9 +24,9 @@
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
-import jdk.vm.ci.meta.ValueKind;
 import jdk.vm.ci.meta.VMConstant;
 import jdk.vm.ci.meta.Value;
+import jdk.vm.ci.meta.ValueKind;
 
 public final class HotSpotSentinelConstant extends Value implements JavaConstant, VMConstant {
 
@@ -37,6 +37,7 @@
         this.javaKind = javaKind;
     }
 
+    @Override
     public JavaKind getJavaKind() {
         return javaKind;
     }
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotUnresolvedField.java	Fri Apr 06 10:17:26 2018 -0700
+++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotUnresolvedField.java	Fri Apr 13 16:22:28 2018 -0700
@@ -40,14 +40,17 @@
         this.holder = holder;
     }
 
+    @Override
     public String getName() {
         return name;
     }
 
+    @Override
     public JavaType getType() {
         return type;
     }
 
+    @Override
     public JavaType getDeclaringClass() {
         return holder;
     }
--- a/jvmci/jdk.vm.ci.meta/src/jdk/vm/ci/meta/DefaultProfilingInfo.java	Fri Apr 06 10:17:26 2018 -0700
+++ b/jvmci/jdk.vm.ci.meta/src/jdk/vm/ci/meta/DefaultProfilingInfo.java	Fri Apr 13 16:22:28 2018 -0700
@@ -96,14 +96,17 @@
         return "DefaultProfilingInfo<" + this.toString(null, "; ") + ">";
     }
 
+    @Override
     public void setMature() {
         // Do nothing
     }
 
+    @Override
     public boolean setCompilerIRSize(Class<?> irType, int nodeCount) {
         return false;
     }
 
+    @Override
     public int getCompilerIRSize(Class<?> irType) {
         return -1;
     }
--- a/jvmci/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaConstant.java	Fri Apr 06 10:17:26 2018 -0700
+++ b/jvmci/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaConstant.java	Fri Apr 13 16:22:28 2018 -0700
@@ -81,6 +81,7 @@
      *
      * @return {@code true} if this constant is the default value for its kind
      */
+    @Override
     boolean isDefaultForKind();
 
     /**
@@ -130,6 +131,7 @@
      */
     double asDouble();
 
+    @Override
     default String toValueString() {
         if (getJavaKind() == JavaKind.Illegal) {
             return "illegal";
--- a/jvmci/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ModifiersProvider.java	Fri Apr 06 10:17:26 2018 -0700
+++ b/jvmci/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ModifiersProvider.java	Fri Apr 13 16:22:28 2018 -0700
@@ -22,15 +22,11 @@
  */
 package jdk.vm.ci.meta;
 
-import static java.lang.reflect.Modifier.FINAL;
+import java.lang.reflect.Modifier;
+
 import static java.lang.reflect.Modifier.PRIVATE;
 import static java.lang.reflect.Modifier.PROTECTED;
 import static java.lang.reflect.Modifier.PUBLIC;
-import static java.lang.reflect.Modifier.STATIC;
-import static java.lang.reflect.Modifier.TRANSIENT;
-import static java.lang.reflect.Modifier.VOLATILE;
-
-import java.lang.reflect.Modifier;
 
 /**
  * A Java element (i.e., a class, interface, field or method) that is described by a set of Java
@@ -148,19 +144,4 @@
     default boolean isConcrete() {
         return !isAbstract();
     }
-
-    /**
-     * This is removed in JDK 9 and should not be used. It used to rely on use of reflection to read
-     * non-public values from {@link Modifier}. Such cross-module (i.e., {@code jdk.vm.ci} to
-     * {@code java.base}) reflection is disabled in 9 and will require a VM option such
-     * {@code --add-exports-private} to be enabled.
-     */
-    @Deprecated
-    static int jvmFieldModifiers() {
-        // Reflection replaced with hard coded values (which will not change in JDK 8).
-        final int accEnum = 0x4000;
-        final int accSynthethic = 0x1000;
-        return PUBLIC | PRIVATE | PROTECTED | STATIC | FINAL | VOLATILE | TRANSIENT | accEnum | accSynthethic;
-    }
-
 }
--- a/jvmci/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaField.java	Fri Apr 06 10:17:26 2018 -0700
+++ b/jvmci/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaField.java	Fri Apr 13 16:22:28 2018 -0700
@@ -37,6 +37,7 @@
      * Only the {@linkplain Modifier#fieldModifiers() field flags} specified in the JVM
      * specification will be included in the returned mask.
      */
+    @Override
     int getModifiers();
 
     default boolean isFinal() {
@@ -58,5 +59,6 @@
      * Returns the {@link ResolvedJavaType} object representing the class or interface that declares
      * this field.
      */
+    @Override
     ResolvedJavaType getDeclaringClass();
 }
--- a/jvmci/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaMethod.java	Fri Apr 06 10:17:26 2018 -0700
+++ b/jvmci/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaMethod.java	Fri Apr 13 16:22:28 2018 -0700
@@ -60,6 +60,7 @@
      * Returns the {@link ResolvedJavaType} object representing the class or interface that declares
      * this method.
      */
+    @Override
     ResolvedJavaType getDeclaringClass();
 
     /**
@@ -273,14 +274,17 @@
             return method.isVarArgs() && index == method.getSignature().getParameterCount(false) - 1;
         }
 
+        @Override
         public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
             return method.getParameterAnnotations(annotationClass)[index];
         }
 
+        @Override
         public Annotation[] getAnnotations() {
             return method.getParameterAnnotations()[index];
         }
 
+        @Override
         public Annotation[] getDeclaredAnnotations() {
             return getAnnotations();
         }
--- a/jvmci/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaType.java	Fri Apr 06 10:17:26 2018 -0700
+++ b/jvmci/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaType.java	Fri Apr 13 16:22:28 2018 -0700
@@ -52,6 +52,7 @@
      *
      * @return {@code true} if this type is an interface
      */
+    @Override
     boolean isInterface();
 
     /**
@@ -186,8 +187,10 @@
      */
     AssumptionResult<ResolvedJavaType> findLeafConcreteSubtype();
 
+    @Override
     ResolvedJavaType getComponentType();
 
+    @Override
     default ResolvedJavaType getElementalType() {
         ResolvedJavaType t = this;
         while (t.isArray()) {
@@ -196,6 +199,7 @@
         return t;
     }
 
+    @Override
     ResolvedJavaType getArrayClass();
 
     /**
--- a/jvmci/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ValueKind.java	Fri Apr 06 10:17:26 2018 -0700
+++ b/jvmci/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ValueKind.java	Fri Apr 13 16:22:28 2018 -0700
@@ -33,18 +33,22 @@
 
         private final EnumKey<IllegalKind> key = new EnumKey<>(this);
 
+        @Override
         public Key getKey() {
             return key;
         }
 
+        @Override
         public int getSizeInBytes() {
             return 0;
         }
 
+        @Override
         public int getVectorLength() {
             return 0;
         }
 
+        @Override
         public char getTypeChar() {
             return '-';
         }
--- a/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/ResolvedJavaTypeResolveConcreteMethodTest.java	Fri Apr 06 10:17:26 2018 -0700
+++ b/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/ResolvedJavaTypeResolveConcreteMethodTest.java	Fri Apr 13 16:22:28 2018 -0700
@@ -24,13 +24,14 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
+
+import org.junit.Test;
+
 import jdk.vm.ci.meta.MetaAccessProvider;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaType;
 import jdk.vm.ci.runtime.JVMCI;
 
-import org.junit.Test;
-
 public class ResolvedJavaTypeResolveConcreteMethodTest {
     public final MetaAccessProvider metaAccess;
 
@@ -53,6 +54,7 @@
     }
 
     protected static class B extends A implements I {
+        @Override
         public void i() {
         }
 
@@ -67,6 +69,7 @@
     }
 
     protected static class C extends B {
+        @Override
         public void d() {
         }
     }
--- a/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/ResolvedJavaTypeResolveMethodTest.java	Fri Apr 06 10:17:26 2018 -0700
+++ b/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/ResolvedJavaTypeResolveMethodTest.java	Fri Apr 13 16:22:28 2018 -0700
@@ -24,13 +24,14 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
+
+import org.junit.Test;
+
 import jdk.vm.ci.meta.MetaAccessProvider;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaType;
 import jdk.vm.ci.runtime.JVMCI;
 
-import org.junit.Test;
-
 public class ResolvedJavaTypeResolveMethodTest {
     public final MetaAccessProvider metaAccess;
 
@@ -53,6 +54,7 @@
     }
 
     protected static class B extends A implements I {
+        @Override
         public void i() {
         }
 
@@ -67,6 +69,7 @@
     }
 
     protected static class C extends B {
+        @Override
         public void d() {
         }
     }
--- a/jvmci/jdk.vm.ci.sparc/src/jdk/vm/ci/sparc/SPARCKind.java	Fri Apr 06 10:17:26 2018 -0700
+++ b/jvmci/jdk.vm.ci.sparc/src/jdk/vm/ci/sparc/SPARCKind.java	Fri Apr 13 16:22:28 2018 -0700
@@ -65,6 +65,7 @@
         return scalar;
     }
 
+    @Override
     public int getSizeInBytes() {
         return size;
     }
@@ -73,10 +74,12 @@
         return getSizeInBytes() * 8;
     }
 
+    @Override
     public int getVectorLength() {
         return vectorLength;
     }
 
+    @Override
     public Key getKey() {
         return key;
     }
@@ -97,6 +100,7 @@
         return !isInteger();
     }
 
+    @Override
     public char getTypeChar() {
         switch (this) {
             case BYTE:
--- a/mx.jvmci/eclipse-settings/org.eclipse.jdt.core.prefs	Fri Apr 06 10:17:26 2018 -0700
+++ b/mx.jvmci/eclipse-settings/org.eclipse.jdt.core.prefs	Fri Apr 13 16:22:28 2018 -0700
@@ -1,1 +1,2 @@
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled