No need to load ModuleLoader multiple times

When loading a setting we can just check if the ModuleLoader is already loaded. When loading a module we have already loaded a setting and thus the ModuleLoader must be available already.
Raku · Jan 25, 2018 · b930e35 · b930e35
1 parent b88de49
commit b930e35
Showing 1 changed file with 15 additions and 14 deletions.
diff --git a/src/NQP/World.nqp b/src/NQP/World.nqp
@@ -91,13 +91,21 @@ class NQP::World is HLL::World {
             if self.is_precompilation_mode() {
                 self.add_load_dependency_task(:deserialize_ast(QAST::Stmts.new(
                     QAST::Op.new(
-                        :op('loadbytecode'),
-                        QAST::VM.new(
-                            :jvm(QAST::SVal.new( :value('ModuleLoader.class') )),
-                            :moar(QAST::SVal.new( :value('ModuleLoader.moarvm') )),
-                            :js(QAST::SVal.new( :value('ModuleLoader') ))
-                        )),
-                    $set_outer
+                        :op('ifnull'),
+                        QAST::Op.new(
+                            :op('getcurhllsym'),
+                            QAST::SVal.new( :value('ModuleLoader') ),
+                        ),
+                        QAST::Op.new(
+                            :op('loadbytecode'),
+                            QAST::VM.new(
+                                :jvm(QAST::SVal.new( :value('ModuleLoader.class') )),
+                                :moar(QAST::SVal.new( :value('ModuleLoader.moarvm') )),
+                                :js(QAST::SVal.new( :value('ModuleLoader') ))
+                            )
+                        ),
+                    ),
+                    $set_outer,
                 )));
             }
             else {
@@ -117,13 +125,6 @@ class NQP::World is HLL::World {
         # Make sure we do the loading during deserialization.
         if self.is_precompilation_mode() {
             self.add_load_dependency_task(:deserialize_ast(QAST::Stmts.new(
-                QAST::Op.new(
-                    :op('loadbytecode'),
-                    QAST::VM.new(
-                        :jvm(QAST::SVal.new( :value('ModuleLoader.class') )),
-                        :moar(QAST::SVal.new( :value('ModuleLoader.moarvm') )),
-                        :js(QAST::SVal.new( :value('ModuleLoader') ))
-                    )),
                 QAST::Op.new(
                    :op('callmethod'), :name('load_module'),
                    QAST::Op.new(