--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/SymbolMetadata.java	Fri Dec 16 15:27:34 2016 +0000
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/SymbolMetadata.java	Fri Dec 16 15:27:47 2016 +0000
@@ -72,19 +72,19 @@
      * Type attributes for this symbol.
      * This field should never be null.
      */
-    private List<Attribute.TypeCompound> type_attributes = List.<Attribute.TypeCompound>nil();
+    private List<Attribute.TypeCompound> type_attributes = List.nil();
 
     /*
      * Type attributes of initializers in this class.
      * Unused if the current symbol is not a ClassSymbol.
      */
-    private List<Attribute.TypeCompound> init_type_attributes = List.<Attribute.TypeCompound>nil();
+    private List<Attribute.TypeCompound> init_type_attributes = List.nil();
 
     /*
      * Type attributes of class initializers in this class.
      * Unused if the current symbol is not a ClassSymbol.
      */
-    private List<Attribute.TypeCompound> clinit_type_attributes = List.<Attribute.TypeCompound>nil();
+    private List<Attribute.TypeCompound> clinit_type_attributes = List.nil();
 
     /*
      * The Symbol this SymbolMetadata instance belongs to
@@ -248,7 +248,7 @@
 
     private List<Attribute.Compound> filterDeclSentinels(List<Attribute.Compound> a) {
         return (a == DECL_IN_PROGRESS || a == DECL_NOT_STARTED)
-                ? List.<Attribute.Compound>nil()
+                ? List.nil()
                 : a;
     }