- Added initialization of module singleton in m...

- Added initialization of module singleton in module's constructor

1 files changed, 8 insertions, 0 deletions

diff --git a/sources/scalac/transformer/AddConstructors.java b/sources/scalac/transformer/AddConstructors.java
index 160839c6d8..24d248a200 100644
--- a/sources/scalac/transformer/AddConstructors.java
+++ b/sources/scalac/transformer/AddConstructors.java
@@ -146,6 +146,14 @@ public class AddConstructors extends Transformer {
 		}
 	    }
 
+	    // inline initialization of module values
+            if (forINT && treeSym.isModuleClass()) {
+                constrBody.add(
+                    gen.Assign(
+                        gen.mkRef(tree.pos, treeSym.module()),
+                        gen.This(tree.pos, treeSym)));
+            }
+
 	    // for every ValDef move the initialization code into the constructor
 	    for (int i = 0; i < body.length; i++) {
 		Tree t = body[i];