The loaded module list should be in the GlobalContext, not a static variable

Author: sorear

src/vm/jvm/runtime/org/perl6/nqp/runtime/GlobalContext.java

@@ -1,6 +1,7 @@
 package org.perl6.nqp.runtime;
 
 import java.util.HashMap;
+import java.util.HashSet;
 
 import org.perl6.nqp.sixmodel.CodePairContainerConfigurer;
 import org.perl6.nqp.sixmodel.ContainerConfigurer;
@@ -148,6 +149,11 @@ public class GlobalContext {
      */
     public HashMap<String, SixModelObject> scRefs;
 
+    /**
+     * Set of library filenames which have been loaded so far.
+     */
+    public HashSet<String> loaded;
+
     /**
      * Whether to dump VM-level stack traces for all exceptions.
      */
@@ -169,6 +175,7 @@ public GlobalContext()
         scRefs = new HashMap<String, SixModelObject>();
         compilerRegistry = new HashMap<String, SixModelObject>();
         hllSyms = new HashMap<String, HashMap<String, SixModelObject>>();
+        loaded = new HashSet<String>();
 
         contConfigs = new HashMap<String, ContainerConfigurer>();
         contConfigs.put("code_pair", new CodePairContainerConfigurer());

src/vm/jvm/runtime/org/perl6/nqp/runtime/LibraryLoader.java

@@ -6,11 +6,9 @@
 import java.util.HashSet;
 
 public class LibraryLoader {
-    public static HashSet<String> loaded = new HashSet<String>();
-    
     public void load(ThreadContext tc, String origFilename) {        
         // Don't load the same thing multiple times.
-        if (loaded.contains(origFilename))
+        if (tc.gc.loaded.contains(origFilename))
             return;
 
         try {
@@ -40,7 +38,7 @@ public void load(ThreadContext tc, String origFilename) {
             cu.runLoadIfAvailable(tc);
 
             // Note that we already loaded it.
-            loaded.add(origFilename);
+            tc.gc.loaded.add(origFilename);
         }
         catch (ControlException e) {
             throw e;