src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java

rev 48842 : imported patch 8187950-ext

*** 928,938 ****
          public <R, P> R accept(TypeVisitor<R, P> v, P p) {
              return v.visitWildcard(this, p);
          }
      }
  
!     public static class ClassType extends Type implements DeclaredType {
  
          /** The enclosing type of this type. If this is the type of an inner
           *  class, outer_field refers to the type of its enclosing
           *  instance class, in all other cases it refers to noType.
           */
--- 928,939 ----
          public <R, P> R accept(TypeVisitor<R, P> v, P p) {
              return v.visitWildcard(this, p);
          }
      }
  
!     public static class ClassType extends Type implements DeclaredType,
!                                                           javax.lang.model.type.ErrorType {
  
          /** The enclosing type of this type. If this is the type of an inner
           *  class, outer_field refers to the type of its enclosing
           *  instance class, in all other cases it refers to noType.
           */
*** 1139,1149 ****
              tsym.complete();
          }
  
          @DefinedBy(Api.LANGUAGE_MODEL)
          public TypeKind getKind() {
!             return TypeKind.DECLARED;
          }
  
          @DefinedBy(Api.LANGUAGE_MODEL)
          public <R, P> R accept(TypeVisitor<R, P> v, P p) {
              return v.visitDeclared(this, p);
--- 1140,1151 ----
              tsym.complete();
          }
  
          @DefinedBy(Api.LANGUAGE_MODEL)
          public TypeKind getKind() {
!             tsym.apiComplete();
!             return tsym.kind == TYP ? TypeKind.DECLARED : TypeKind.ERROR;
          }
  
          @DefinedBy(Api.LANGUAGE_MODEL)
          public <R, P> R accept(TypeVisitor<R, P> v, P p) {
              return v.visitDeclared(this, p);