Fix potential race condition in EVAL (#2015)

Fix potential race condition in EVAL
rakudo · Jul 3, 2018 · 80bbfbb · 80bbfbb
1 parent 513577c
commit 80bbfbb
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/Perl6/Grammar.nqp b/src/Perl6/Grammar.nqp
@@ -472,7 +472,14 @@ role STD {
 }
 
 grammar Perl6::Grammar is HLL::Grammar does STD {
-    my $sc_id := 0;
+    my class SerializationContextId {
+        my $count := 0;
+        my $lock  := NQPLock.new;
+        method next-id() {
+            $lock.protect({ $count++ })
+        }
+    }
+
     method TOP() {
         # Language braid.
         my $*LANG := self;
@@ -520,7 +527,7 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
         my $file := nqp::getlexdyn('$?FILES');
         my $source_id := nqp::sha1($file ~ (
             nqp::defined(%*COMPILING<%?OPTIONS><outer_ctx>)
-                ?? self.target() ~ $sc_id++
+                ?? self.target() ~ SerializationContextId.next-id()
                 !! self.target()));
         my $outer_world := nqp::getlexdyn('$*W');
         my $is_nested := (