diff -r c1238fcc9515 -r 7375d4979bd3 src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java
--- a/src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java	Mon Nov 14 08:09:47 2011 -0800
+++ b/src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java	Mon Nov 14 15:11:10 2011 -0800
@@ -35,6 +35,7 @@
 
 import com.sun.tools.javac.api.DiagnosticFormatter;
 import com.sun.tools.javac.code.Lint.LintCategory;
+import com.sun.tools.javac.parser.EndPosTable;
 import com.sun.tools.javac.tree.JCTree;
 
 import static com.sun.tools.javac.util.JCDiagnostic.DiagnosticType.*;
@@ -313,7 +314,7 @@
         /** If there is a tree node, and if endPositions are available, get
          *  the end position of the tree node. Otherwise, just returns the
          *  same as getPreferredPosition(). */
-        int getEndPosition(Map<JCTree, Integer> endPosTable);
+        int getEndPosition(EndPosTable endPosTable);
     }
 
     /**
@@ -337,7 +338,7 @@
             return pos;
         }
 
-        public int getEndPosition(Map<JCTree, Integer> endPosTable) {
+        public int getEndPosition(EndPosTable endPosTable) {
             return pos;
         }