langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java

*** 53,62 ****
--- 53,63 ----
  import com.sun.tools.javac.comp.Annotate.AnnotationTypeMetadata;
  import com.sun.tools.javac.file.BaseFileManager;
  import com.sun.tools.javac.file.PathFileObject;
  import com.sun.tools.javac.jvm.ClassFile.NameAndType;
  import com.sun.tools.javac.jvm.ClassFile.Version;
+ import com.sun.tools.javac.main.Option;
  import com.sun.tools.javac.util.*;
  import com.sun.tools.javac.util.DefinedBy.Api;
  import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
  
  import static com.sun.tools.javac.code.Flags.*;
*** 65,75 ****
  import static com.sun.tools.javac.code.TypeTag.CLASS;
  import static com.sun.tools.javac.code.TypeTag.TYPEVAR;
  import static com.sun.tools.javac.jvm.ClassFile.*;
  import static com.sun.tools.javac.jvm.ClassFile.Version.*;
  
! import static com.sun.tools.javac.main.Option.*;
  
  /** This class provides operations to read a classfile into an internal
   *  representation. The internal representation is anchored in a
   *  ClassSymbol which contains in its scope symbol representations
   *  for all other definitions in the classfile. Top-level Classes themselves
--- 66,76 ----
  import static com.sun.tools.javac.code.TypeTag.CLASS;
  import static com.sun.tools.javac.code.TypeTag.TYPEVAR;
  import static com.sun.tools.javac.jvm.ClassFile.*;
  import static com.sun.tools.javac.jvm.ClassFile.Version.*;
  
! import static com.sun.tools.javac.main.Option.PARAMETERS;
  
  /** This class provides operations to read a classfile into an internal
   *  representation. The internal representation is anchored in a
   *  ClassSymbol which contains in its scope symbol representations
   *  for all other definitions in the classfile. Top-level Classes themselves
*** 234,244 ****
          diagFactory = JCDiagnostic.Factory.instance(context);
  
          log = Log.instance(context);
  
          Options options = Options.instance(context);
!         verbose         = options.isSet(VERBOSE);
  
          Source source = Source.instance(context);
          allowSimplifiedVarargs = source.allowSimplifiedVarargs();
          allowModules     = source.allowModules();
  
--- 235,245 ----
          diagFactory = JCDiagnostic.Factory.instance(context);
  
          log = Log.instance(context);
  
          Options options = Options.instance(context);
!         verbose         = options.isSet(Option.VERBOSE);
  
          Source source = Source.instance(context);
          allowSimplifiedVarargs = source.allowSimplifiedVarargs();
          allowModules     = source.allowModules();