--- old/src/jdk.compiler/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java	2018-08-03 14:07:29.958792414 +0200
+++ new/src/jdk.compiler/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java	2018-08-03 14:07:29.610792430 +0200
@@ -219,6 +219,10 @@
         else if (arg instanceof Source) {
             return ((Source)arg).name;
         }
+        else if (arg instanceof Tag) {
+            return messages.getLocalizedString(l, "compiler.misc.tree.tag." +
+                                                  StringUtils.toLowerCase(((Tag) arg).name()));
+        }
         else {
             return String.valueOf(arg);
         }