Some changes to make arrays work better

1 files changed, 6 insertions, 4 deletions

diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
index 2dfd93b63f..4519d2fcd6 100644
--- a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
+++ b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
@@ -54,6 +54,10 @@ abstract class ClassfileParser {
   }
 
   def parse(file: AbstractFile, root: Symbol): unit = {
+    def handleError(e: Exception) = {
+      if (settings.debug.value) e.printStackTrace();//debug
+      throw new IOException("class file '" + in.file + "' is broken")
+    }
     assert(!busy);
     busy = true;
     this.in = new AbstractFileReader(file);
@@ -71,10 +75,8 @@ abstract class ClassfileParser {
       this.pool = new ConstantPool;
       parseClass()
     } catch {
-      case e: RuntimeException =>
-        e.printStackTrace();
-        if (settings.debug.value)
-        throw new IOException("class file '" + in.file + "' is broken")
+      case e: FatalError => handleError(e)
+      case e: RuntimeException => handleError(e)
     }
     busy = false
   }