*** old/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/GraalFilters.java	Tue Aug 22 11:46:51 2017
--- new/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/GraalFilters.java	Tue Aug 22 11:46:51 2017

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 2016, 2017, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.

*** 43,53 ****
--- 43,53 ----
  import org.graalvm.compiler.hotspot.replacements.HotSpotClassSubstitutions;
  import org.graalvm.compiler.hotspot.word.MetaspacePointer;
  import org.graalvm.compiler.replacements.Snippets;
  import org.graalvm.word.WordBase;
  
! public class GraalFilters {
! final class GraalFilters {
      private List<ResolvedJavaType> specialClasses;
      private List<ResolvedJavaType> specialArgumentAndReturnTypes;
  
      private static Set<Class<?>> skipAnnotations = new HashSet<>();
  

*** 55,65 ****
--- 55,65 ----
          skipAnnotations.add(NodeIntrinsic.class);
          skipAnnotations.add(Snippet.class);
          skipAnnotations.add(MethodSubstitution.class);
      }
  
-     public boolean shouldCompileMethod(ResolvedJavaMethod method) {
          // NodeIntrinsics cannot be compiled.
          if (hasExcludedAnnotation(method)) {
              return false;
          }
  

*** 81,91 ****
--- 81,91 ----
              }
          }
          return false;
      }
  
-     public boolean shouldCompileAnyMethodInClass(ResolvedJavaType klass) {
          if (specialClasses.stream().filter(s -> s.isAssignableFrom(klass)).findAny().isPresent()) {
              return false;
          }
          return true;
      }

*** 111,121 ****
--- 111,121 ----
      GraalFilters(MetaAccessProvider metaAccess) {
          specialClasses = getSpecialClasses(metaAccess);
          specialArgumentAndReturnTypes = getSpecialArgumentAndReturnTypes(metaAccess);
      }
  
!     public boolean shouldIgnoreException(Throwable e) {
!     static boolean shouldIgnoreException(Throwable e) {
          if (e instanceof GraalError) {
              String m = e.getMessage();
              if (m.contains("ArrayKlass::_component_mirror")) {
                  // When compiling Graal, ignore errors in JDK8 snippets.
                  return true;