--- a/jvmci/jdk.internal.jvmci.hotspot.amd64/src/jdk/internal/jvmci/hotspot/amd64/AMD64HotSpotJVMCIBackendFactory.java	Wed Sep 02 10:14:53 2015 -0700
+++ b/jvmci/jdk.internal.jvmci.hotspot.amd64/src/jdk/internal/jvmci/hotspot/amd64/AMD64HotSpotJVMCIBackendFactory.java	Thu Sep 03 00:53:54 2015 +0200
@@ -131,6 +131,7 @@
         return "JVMCIBackend:" + getArchitecture();
     }
 
+    @SuppressWarnings("try")
     public JVMCIBackend createJVMCIBackend(HotSpotJVMCIRuntimeProvider runtime, CompilerFactory compilerFactory, JVMCIBackend host) {
 
         assert host == null;

--- a/jvmci/jdk.internal.jvmci.hotspot.sparc/src/jdk/internal/jvmci/hotspot/sparc/SPARCHotSpotJVMCIBackendFactory.java	Wed Sep 02 10:14:53 2015 -0700
+++ b/jvmci/jdk.internal.jvmci.hotspot.sparc/src/jdk/internal/jvmci/hotspot/sparc/SPARCHotSpotJVMCIBackendFactory.java	Thu Sep 03 00:53:54 2015 +0200
@@ -80,6 +80,7 @@
         return "JVMCIBackend:" + getArchitecture();
     }
 
+    @SuppressWarnings("try")
     public JVMCIBackend createJVMCIBackend(HotSpotJVMCIRuntimeProvider runtime, CompilerFactory compilerFactory, JVMCIBackend host) {
         assert host == null;
         TargetDescription target = createTarget(runtime.getConfig(), compilerFactory);

--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/CompilerToVMImpl.java	Wed Sep 02 10:14:53 2015 -0700
+++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/CompilerToVMImpl.java	Thu Sep 03 00:53:54 2015 +0200
@@ -39,6 +39,11 @@
     private static native void init();
 
     static {
+        timedInit();
+    }
+
+    @SuppressWarnings("try")
+    private static void timedInit() {
         try (InitTimer t = timer("CompilerToVMImpl.init")) {
             init();
         }

--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotJVMCIRuntime.java	Wed Sep 02 10:14:53 2015 -0700
+++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotJVMCIRuntime.java	Thu Sep 03 00:53:54 2015 +0200
@@ -51,6 +51,7 @@
         JVMCI.initialize();
     }
 
+    @SuppressWarnings("try")
     static class DelayedInit {
         private static final HotSpotJVMCIRuntime instance;
 
@@ -133,6 +134,7 @@
 
     private final Iterable<HotSpotVMEventListener> vmEventListeners;
 
+    @SuppressWarnings("try")
     private HotSpotJVMCIRuntime() {
         compilerToVm = new CompilerToVMImpl();
         try (InitTimer t = timer("HotSpotVMConfig<init>")) {

--- a/jvmci/jdk.internal.jvmci.options.test/src/jdk/internal/jvmci/options/test/NestedBooleanOptionValueTest.java	Wed Sep 02 10:14:53 2015 -0700
+++ b/jvmci/jdk.internal.jvmci.options.test/src/jdk/internal/jvmci/options/test/NestedBooleanOptionValueTest.java	Thu Sep 03 00:53:54 2015 +0200
@@ -47,6 +47,7 @@
     static final OptionDescriptor master2 = OptionDescriptor.create("Master2", Boolean.class, "", Options.class, "Master2", Master2);
     static final OptionDescriptor nestedOption2 = OptionDescriptor.create("NestedOption2", Boolean.class, "", Options.class, "NestedOption2", NestedOption2);
 
+    @SuppressWarnings("try")
     @Test
     public void runOverrides() {
         assertTrue(Master0.getValue());

--- a/jvmci/jdk.internal.jvmci.options.test/src/jdk/internal/jvmci/options/test/TestOptionValue.java	Wed Sep 02 10:14:53 2015 -0700
+++ b/jvmci/jdk.internal.jvmci.options.test/src/jdk/internal/jvmci/options/test/TestOptionValue.java	Thu Sep 03 00:53:54 2015 +0200
@@ -32,6 +32,7 @@
 
 import org.junit.*;
 
+@SuppressWarnings("try")
 public class TestOptionValue {
 
     public static class Options {

--- a/jvmci/jdk.internal.jvmci.options/src/jdk/internal/jvmci/options/OptionsParser.java	Wed Sep 02 10:14:53 2015 -0700
+++ b/jvmci/jdk.internal.jvmci.options/src/jdk/internal/jvmci/options/OptionsParser.java	Thu Sep 03 00:53:54 2015 +0200
@@ -74,6 +74,7 @@
      *
      * @param options space separated set of JVMCI options to parse
      */
+    @SuppressWarnings("try")
     public static Boolean parseOptionsFromVM(String options) {
         try (InitTimer t = timer("ParseOptions")) {
             JVMCIJarsOptionDescriptorsProvider odp = new JVMCIJarsOptionDescriptorsProvider();