src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ClassUseMapper.java

*** 37,53 ****
--- 37,55 ----
  import javax.lang.model.type.DeclaredType;
  import javax.lang.model.type.ErrorType;
  import javax.lang.model.type.TypeMirror;
  import javax.lang.model.type.TypeVariable;
  import javax.lang.model.type.WildcardType;
+ import javax.lang.model.util.ElementFilter;
  import javax.lang.model.util.Elements;
  import javax.lang.model.util.SimpleElementVisitor9;
  import javax.lang.model.util.SimpleTypeVisitor9;
  import javax.lang.model.util.Types;
  
  import jdk.javadoc.doclet.DocletEnvironment;
  import jdk.javadoc.internal.doclets.formats.html.HtmlConfiguration;
+ import jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberMap.Kind;
  
  /**
   * Map all class uses for a given class.
   *
   * <p>
*** 239,249 ****
              for (ExecutableElement ctor : ctors) {
                  mapAnnotations(classToConstructorAnnotations, ctor, ctor);
                  mapExecutable(ctor);
              }
  
!             List<ExecutableElement> methods = utils.getMethods(aClass);
              for (ExecutableElement method : methods) {
                  mapExecutable(method);
                  mapTypeParameters(classToMethodTypeParam, method, method);
                  mapAnnotations(classToMethodAnnotations, method, method);
                  SimpleTypeVisitor9<Void, ExecutableElement> stv = new SimpleTypeVisitor9<Void, ExecutableElement>() {
--- 241,252 ----
              for (ExecutableElement ctor : ctors) {
                  mapAnnotations(classToConstructorAnnotations, ctor, ctor);
                  mapExecutable(ctor);
              }
  
!             VisibleMemberMap vmm = configuration.getVisibleMemberMap(aClass, Kind.METHODS);
!             List<ExecutableElement> methods = ElementFilter.methodsIn(vmm.getMembers(aClass));
              for (ExecutableElement method : methods) {
                  mapExecutable(method);
                  mapTypeParameters(classToMethodTypeParam, method, method);
                  mapAnnotations(classToMethodAnnotations, method, method);
                  SimpleTypeVisitor9<Void, ExecutableElement> stv = new SimpleTypeVisitor9<Void, ExecutableElement>() {