--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/FieldBuilder.java	Tue Apr 24 16:48:29 2018 -0700
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/FieldBuilder.java	Tue Apr 24 11:54:03 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -35,8 +35,8 @@
 import jdk.javadoc.internal.doclets.toolkit.Content;
 import jdk.javadoc.internal.doclets.toolkit.DocletException;
 import jdk.javadoc.internal.doclets.toolkit.FieldWriter;
-import jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberMap;
 
+import static jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberTable.Kind.*;
 
 /**
  * Builds documentation for a field.
@@ -52,16 +52,6 @@
 public class FieldBuilder extends AbstractMemberBuilder {
 
     /**
-     * The class whose fields are being documented.
-     */
-    private final TypeElement typeElement;
-
-    /**
-     * The visible fields for the given class.
-     */
-    private final VisibleMemberMap visibleMemberMap;
-
-    /**
      * The writer to output the field documentation.
      */
     private final FieldWriter writer;
@@ -69,7 +59,7 @@
     /**
      * The list of fields being documented.
      */
-    private final List<Element> fields;
+    private final List<? extends Element> fields;
 
     /**
      * The index of the current field that is being documented at this point
@@ -85,14 +75,11 @@
      * @param writer the doclet specific writer.
      */
     private FieldBuilder(Context context,
-            TypeElement typeElement,
-            FieldWriter writer) {
-        super(context);
-        this.typeElement = typeElement;
+                         TypeElement typeElement,
+                         FieldWriter writer) {
+        super(context, typeElement);
         this.writer = writer;
-        visibleMemberMap = configuration.getVisibleMemberMap(typeElement,
-                VisibleMemberMap.Kind.FIELDS);
-        fields = visibleMemberMap.getLeafMembers();
+        fields = getVisibleMembers(FIELDS);
     }
 
     /**