test/tools/javac/varargs/warning/Warn4.java

*** 71,87 ****
                  SuppressLevel suppressLevelClient,
                  SuppressLevel suppressLevelDecl,
                  ModifierKind modKind) {
              switch(this) {
                  case VARARGS:
!                     return source == SourceLevel.JDK_6 ||
                              suppressLevelDecl == SuppressLevel.UNCHECKED ||
                              trustMe == TrustMe.TRUST;
                  case UNCHECKED:
                      return suppressLevelClient == SuppressLevel.UNCHECKED ||
!                         (trustMe == TrustMe.TRUST && modKind !=
!                             ModifierKind.NONE && source == SourceLevel.JDK_7);
              }
  
              SuppressLevel supLev = this == VARARGS ?
                  suppressLevelDecl :
                  suppressLevelClient;
--- 71,89 ----
                  SuppressLevel suppressLevelClient,
                  SuppressLevel suppressLevelDecl,
                  ModifierKind modKind) {
              switch(this) {
                  case VARARGS:
!                     return source.compareTo(SourceLevel.JDK_7) < 0 ||
                              suppressLevelDecl == SuppressLevel.UNCHECKED ||
                              trustMe == TrustMe.TRUST;
                  case UNCHECKED:
                      return suppressLevelClient == SuppressLevel.UNCHECKED ||
!                         (trustMe == TrustMe.TRUST &&
!                          (((modKind == ModifierKind.FINAL || modKind == ModifierKind.STATIC) &&
!                            source.compareTo( SourceLevel.JDK_7) >= 0 ) ||
!                           (modKind == ModifierKind.PRIVATE && source.compareTo( SourceLevel.JDK_9) >= 0 )));
              }
  
              SuppressLevel supLev = this == VARARGS ?
                  suppressLevelDecl :
                  suppressLevelClient;
*** 90,100 ****
          }
      }
  
      enum SourceLevel {
          JDK_6("6"),
!         JDK_7("7");
  
          String sourceKey;
  
          SourceLevel(String sourceKey) {
              this.sourceKey = sourceKey;
--- 92,103 ----
          }
      }
  
      enum SourceLevel {
          JDK_6("6"),
!         JDK_7("7"),
!         JDK_9("9");
  
          String sourceKey;
  
          SourceLevel(String sourceKey) {
              this.sourceKey = sourceKey;
*** 113,123 ****
      }
  
      enum ModifierKind {
          NONE(" "),
          FINAL("final "),
!         STATIC("static ");
  
          String mod;
  
          ModifierKind(String mod) {
              this.mod = mod;
--- 116,127 ----
      }
  
      enum ModifierKind {
          NONE(" "),
          FINAL("final "),
!         STATIC("static "),
!         PRIVATE("private ");
  
          String mod;
  
          ModifierKind(String mod) {
              this.mod = mod;