*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderConfiguration.java	Mon Mar 20 17:40:49 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderConfiguration.java	Mon Mar 20 17:40:49 2017

*** 22,32 ****
--- 22,31 ----
   */
  package org.graalvm.compiler.nodes.graphbuilderconf;
  
  import java.util.Arrays;
  
  import org.graalvm.compiler.core.common.GraalOptions;
  import org.graalvm.compiler.core.common.type.StampPair;
  
  import jdk.vm.ci.meta.JavaType;
  import jdk.vm.ci.meta.ResolvedJavaType;
  

*** 193,203 ****
--- 192,201 ----
      private final BytecodeExceptionMode bytecodeExceptionMode;
      private final boolean omitAssertions;
      private final ResolvedJavaType[] skippedExceptionTypes;
      private final boolean insertFullInfopoints;
      private final boolean trackNodeSourcePosition;
      private final boolean clearNonLiveLocals;
      private final Plugins plugins;
  
      public enum BytecodeExceptionMode {
          /**
           * This mode always explicitly checks for exceptions.

*** 206,230 ****
--- 204,232 ----
          /**
           * This mode omits all explicit exception edges.
           */
          OmitAll,
          /**
+          * This mode omits exception edges at invokes, but not for implicit null checks or bounds
+          * checks.
+          */
+         ExplicitOnly,
+         /**
           * This mode uses profiling information to decide whether to use explicit exception edges.
           */
          Profile
      }
  
      protected GraphBuilderConfiguration(boolean eagerResolving, BytecodeExceptionMode bytecodeExceptionMode, boolean omitAssertions, boolean insertFullInfopoints,
                      boolean trackNodeSourcePosition, ResolvedJavaType[] skippedExceptionTypes,
-                     boolean clearNonLiveLocals, Plugins plugins) {
          this.eagerResolving = eagerResolving;
          this.bytecodeExceptionMode = bytecodeExceptionMode;
          this.omitAssertions = omitAssertions;
          this.insertFullInfopoints = insertFullInfopoints;
          this.trackNodeSourcePosition = trackNodeSourcePosition;
          this.skippedExceptionTypes = skippedExceptionTypes;
          this.clearNonLiveLocals = clearNonLiveLocals;
          this.plugins = plugins;
      }
  
      /**
       * Creates a copy of this configuration with all its plugins. The {@link InvocationPlugins} in

*** 232,280 ****
--- 234,271 ----
       * {@link InvocationPlugins} in the copy.
       */
      public GraphBuilderConfiguration copy() {
          Plugins newPlugins = new Plugins(plugins);
          GraphBuilderConfiguration result = new GraphBuilderConfiguration(eagerResolving, bytecodeExceptionMode, omitAssertions, insertFullInfopoints, trackNodeSourcePosition, skippedExceptionTypes,
-                         clearNonLiveLocals, newPlugins);
          return result;
      }
  
      public GraphBuilderConfiguration withEagerResolving(boolean newEagerResolving) {
!         return new GraphBuilderConfiguration(newEagerResolving, bytecodeExceptionMode, omitAssertions, insertFullInfopoints, trackNodeSourcePosition, skippedExceptionTypes, clearNonLiveLocals,
                          plugins);
!         return new GraphBuilderConfiguration(newEagerResolving, bytecodeExceptionMode, omitAssertions, insertFullInfopoints, trackNodeSourcePosition, skippedExceptionTypes, plugins);
      }
  
      public GraphBuilderConfiguration withSkippedExceptionTypes(ResolvedJavaType[] newSkippedExceptionTypes) {
!         return new GraphBuilderConfiguration(eagerResolving, bytecodeExceptionMode, omitAssertions, insertFullInfopoints, trackNodeSourcePosition, newSkippedExceptionTypes, clearNonLiveLocals,
                          plugins);
!         return new GraphBuilderConfiguration(eagerResolving, bytecodeExceptionMode, omitAssertions, insertFullInfopoints, trackNodeSourcePosition, newSkippedExceptionTypes, plugins);
      }
  
      public GraphBuilderConfiguration withBytecodeExceptionMode(BytecodeExceptionMode newBytecodeExceptionMode) {
!         return new GraphBuilderConfiguration(eagerResolving, newBytecodeExceptionMode, omitAssertions, insertFullInfopoints, trackNodeSourcePosition, skippedExceptionTypes, clearNonLiveLocals,
                          plugins);
!         return new GraphBuilderConfiguration(eagerResolving, newBytecodeExceptionMode, omitAssertions, insertFullInfopoints, trackNodeSourcePosition, skippedExceptionTypes, plugins);
      }
  
      public GraphBuilderConfiguration withOmitAssertions(boolean newOmitAssertions) {
!         return new GraphBuilderConfiguration(eagerResolving, bytecodeExceptionMode, newOmitAssertions, insertFullInfopoints, trackNodeSourcePosition, skippedExceptionTypes, clearNonLiveLocals,
                          plugins);
!         return new GraphBuilderConfiguration(eagerResolving, bytecodeExceptionMode, newOmitAssertions, insertFullInfopoints, trackNodeSourcePosition, skippedExceptionTypes, plugins);
      }
  
      public GraphBuilderConfiguration withFullInfopoints(boolean newInsertFullInfopoints) {
          ResolvedJavaType[] newSkippedExceptionTypes = skippedExceptionTypes == EMPTY ? EMPTY : Arrays.copyOf(skippedExceptionTypes, skippedExceptionTypes.length);
!         return new GraphBuilderConfiguration(eagerResolving, bytecodeExceptionMode, omitAssertions, newInsertFullInfopoints, trackNodeSourcePosition, newSkippedExceptionTypes, clearNonLiveLocals,
                          plugins);
!         return new GraphBuilderConfiguration(eagerResolving, bytecodeExceptionMode, omitAssertions, newInsertFullInfopoints, trackNodeSourcePosition, newSkippedExceptionTypes, plugins);
      }
  
      public GraphBuilderConfiguration withNodeSourcePosition(boolean newTrackNodeSourcePosition) {
          ResolvedJavaType[] newSkippedExceptionTypes = skippedExceptionTypes == EMPTY ? EMPTY : Arrays.copyOf(skippedExceptionTypes, skippedExceptionTypes.length);
!         return new GraphBuilderConfiguration(eagerResolving, bytecodeExceptionMode, omitAssertions, insertFullInfopoints, newTrackNodeSourcePosition, newSkippedExceptionTypes, clearNonLiveLocals,
                          plugins);
      }
  
      public GraphBuilderConfiguration withClearNonLiveLocals(boolean newClearNonLiveLocals) {
          return new GraphBuilderConfiguration(eagerResolving, bytecodeExceptionMode, omitAssertions, insertFullInfopoints, trackNodeSourcePosition, skippedExceptionTypes, newClearNonLiveLocals,
                          plugins);
!         return new GraphBuilderConfiguration(eagerResolving, bytecodeExceptionMode, omitAssertions, insertFullInfopoints, newTrackNodeSourcePosition, newSkippedExceptionTypes, plugins);
      }
  
      public ResolvedJavaType[] getSkippedExceptionTypes() {
          return skippedExceptionTypes;
      }

*** 297,316 ****
--- 288,303 ----
  
      public boolean insertFullInfopoints() {
          return insertFullInfopoints;
      }
  
      public boolean clearNonLiveLocals() {
          return clearNonLiveLocals;
      }
  
      public static GraphBuilderConfiguration getDefault(Plugins plugins) {
-         return new GraphBuilderConfiguration(false, BytecodeExceptionMode.Profile, false, false, false, EMPTY, GraalOptions.OptClearNonLiveLocals.getValue(), plugins);
      }
  
      public static GraphBuilderConfiguration getSnippetDefault(Plugins plugins) {
-         return new GraphBuilderConfiguration(true, BytecodeExceptionMode.OmitAll, false, false, false, EMPTY, GraalOptions.OptClearNonLiveLocals.getValue(), plugins);
      }
  
      /**
       * Returns {@code true} if it is an error for a class/field/method resolution to fail. The
       * default is the same result as returned by {@link #eagerResolving()}. However, it may be