Fix circular module loading detection and error messaging

rakudo · Nov 25, 2015 · 5344dfd · 5344dfd
1 parent 7155a27
commit 5344dfd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/core/CompUnit/PrecompilationRepository.pm b/src/core/CompUnit/PrecompilationRepository.pm
@@ -62,12 +62,14 @@ class CompUnit::PrecompilationRepository::Default does CompUnit::PrecompilationR
           ?? '--ll-exception'
           !! Empty;
         %*ENV<RAKUDO_PRECOMP_WITH> = $*REPO.repo-chain>>.path-spec.join(',');
+        %*ENV<RAKUDO_PRECOMP_LOADING> = to-json @*MODULES;
 
 RAKUDO_MODULE_DEBUG("Precomping with %*ENV<RAKUDO_PRECOMP_WITH>")
   if $*RAKUDO_MODULE_DEBUG;
 
         my $proc = run($*EXECUTABLE, $lle, "--target={$*VM.precomp-target}", "--output=$io", $path, :out);
         %*ENV<RAKUDO_PRECOMP_WITH>:delete;
+        %*ENV<RAKUDO_PRECOMP_LOADING>:delete;
 
         my @result = $proc.out.lines;
         if not $proc.out.close or $proc.status {  # something wrong

diff --git a/src/core/CompUnit/Repository/Installation.pm b/src/core/CompUnit/Repository/Installation.pm
@@ -106,6 +106,7 @@ sub MAIN(:$name is copy, :$auth, :$ver, *@, *%) {
 
     method install(Distribution $dist, %sources, %scripts?, %resources?) {
         $!lock.protect( {
+        my @*MODULES;
         my $path   = self.writeable-path or die "No writeable path found";
         my $lock //= $.prefix.child('repo.lock').open(:create, :w);
         $lock.lock(2);

diff --git a/src/core/CompUnitRepo.pm b/src/core/CompUnitRepo.pm
@@ -66,21 +66,18 @@ RAKUDO_MODULE_DEBUG("Looking in $spec for $name")
         RAKUDO_MODULE_DEBUG("going to load $module_name: %opts.perl()") if $*RAKUDO_MODULE_DEBUG;
         $lock.protect( {
             my @MODULES = nqp::clone(@*MODULES // ());
-            for @MODULES -> $m {
-                if $m<module> && $m<module> eq $module_name {
-                    nqp::die("Circular module loading detected involving module '$module_name'");
-                }
-            }
 
             {
                 my @*MODULES := @MODULES;
-                if +@*MODULES  == 0 {
-                    @*MODULES[0] = { line => $line, filename => nqp::getlexdyn('$?FILES') };
+                if +@*MODULES == 0 and %*ENV<RAKUDO_PRECOMP_LOADING> -> $loading {
+                    @*MODULES := from-json $loading;
                 }
-                else {
-                    @*MODULES[*-1] = { line => $line };
+                for @*MODULES.list -> $m {
+                    if $m eq $module_name {
+                        nqp::die("Circular module loading detected involving module '$module_name'");
+                    }
                 }
-                @*MODULES.push: { module => $module_name, filename => ~($file // '') };
+                @*MODULES.push: $module_name;
 
                 if %opts<from> {
                     # See if we need to load it from elsewhere.