diff --git a/src/share/classes/com/sun/tools/javac/file/Locations.java b/src/share/classes/com/sun/tools/javac/file/Locations.java
index <HASH>..<HASH> 100644
--- a/src/share/classes/com/sun/tools/javac/file/Locations.java
+++ b/src/share/classes/com/sun/tools/javac/file/Locations.java
@@ -327,7 +327,9 @@ public class Locations {
          */
         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
<I>: Java SE build fails on call to CreateSymbols
Reviewed-by: jjg