- Added loop shortcuts in removeHiddenMembers

2 files changed, 3 insertions, 0 deletions

diff --git a/sources/scalac/symtab/classfile/CLRPackageParser.java b/sources/scalac/symtab/classfile/CLRPackageParser.java
index f82d164f92..6375bb17a4 100644
--- a/sources/scalac/symtab/classfile/CLRPackageParser.java
+++ b/sources/scalac/symtab/classfile/CLRPackageParser.java
@@ -81,6 +81,7 @@ public final class CLRPackageParser extends PackageParser {
         // version.
         boolean separate = global.separate;
         for (Iterator i = sources.entrySet().iterator(); i.hasNext(); ) {
+            if (types.isEmpty()) break;
             HashMap.Entry entry = (HashMap.Entry)i.next();
             String name = (String)entry.getKey();
             AbstractFile sfile = (AbstractFile)entry.getValue();
diff --git a/sources/scalac/symtab/classfile/PackageParser.java b/sources/scalac/symtab/classfile/PackageParser.java
index 50b2fbbc2c..073ebe504f 100644
--- a/sources/scalac/symtab/classfile/PackageParser.java
+++ b/sources/scalac/symtab/classfile/PackageParser.java
@@ -110,6 +110,7 @@ public class PackageParser extends SymbolLoader {
         // the file "<M>.symbl" ignore the ".class" file. Otherwise,
         // if M equals N, ignore the ".symbl" file.
         for (Iterator i = classes.entrySet().iterator(); i.hasNext(); ) {
+            if (symbols.isEmpty()) break;
             Entry entry = (Entry)i.next();
             String cname = (String)entry.getKey();
             AbstractFile cfile = (AbstractFile)entry.getValue();
@@ -134,6 +135,7 @@ public class PackageParser extends SymbolLoader {
         // version.
         boolean separate = global.separate;
         for (Iterator i = sources.entrySet().iterator(); i.hasNext(); ) {
+            if (symbols.isEmpty() && classes.isEmpty()) break;
             HashMap.Entry entry = (HashMap.Entry)i.next();
             String name = (String)entry.getKey();
             AbstractFile sfile = (AbstractFile)entry.getValue();