- Added code to force loading of source of clas...

- Added code to force loading of source of classes Function*

1 files changed, 17 insertions, 0 deletions

diff --git a/sources/scala/tools/scalac/typechecker/Analyzer.scala b/sources/scala/tools/scalac/typechecker/Analyzer.scala
index 4bd10404ec..3cc95814b0 100644
--- a/sources/scala/tools/scalac/typechecker/Analyzer.scala
+++ b/sources/scala/tools/scalac/typechecker/Analyzer.scala
@@ -65,6 +65,9 @@ class Analyzer(global: scalac_Global, descr: AnalyzerPhase) extends Transformer(
       i = i + 1
     }
     super.apply(units);
+    val mixinOnly = global.target != Global.TARGET_INT;
+    List.range(0, definitions.FUNCTION_COUNT).foreach(
+      i => loadCode(definitions.FUNCTION_CLASS(i), mixinOnly));
     var n = descr.newSources.size();
     while (n > 0) { // this calls apply(u) for every unit `u'.
       val l = global.units.length;
@@ -122,6 +125,20 @@ class Analyzer(global: scalac_Global, descr: AnalyzerPhase) extends Transformer(
     }
   }
 
+  def loadCode(clasz: Symbol, mixinOnly: boolean): unit = {
+    assert(clasz.isClass() && !clasz.isModuleClass(), Debug.show(clasz));
+    if (clasz.isExternal()) {
+      try {
+        global.compileLate(global.getSourceFile(clasz), mixinOnly);
+      } catch {
+        case exception: java.io.IOException =>
+          if (global.debug) exception.printStackTrace();
+          global.error(exception.getMessage() + "; source file for "
+                     + clasz + " is needed");
+      }
+    }
+  }
+
   override def apply(unit: CompilationUnit): unit = {
     global.log("checking " + unit);
     assert(this.unit == null, "start unit non null for " + unit);