--- a/langtools/src/share/classes/com/sun/tools/javac/file/Locations.java	Tue Oct 25 10:48:05 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/file/Locations.java	Tue Oct 25 19:18:32 2011 -0700
@@ -327,7 +327,9 @@
          */
         protected LocationHandler(Location location, OptionName... options) {
             this.location = location;
-            this.options = EnumSet.copyOf(Arrays.asList(options));
+            this.options = options.length == 0 ?
+                EnumSet.noneOf(OptionName.class):
+                EnumSet.copyOf(Arrays.asList(options));
         }
 
         // TODO: TEMPORARY, while Options still used for command line options