diff -r 4822dfe0922b -r 3809292620c9 src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
--- a/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java	Mon Dec 12 08:15:32 2011 -0800
+++ b/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java	Tue Dec 13 11:21:28 2011 -0800
@@ -59,7 +59,7 @@
 import static com.sun.tools.javac.jvm.ClassFile.*;
 import static com.sun.tools.javac.jvm.ClassFile.Version.*;
 
-import static com.sun.tools.javac.main.OptionName.*;
+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