From 4525c231a7029cbdec81f4c73c85b71805848247 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Sat, 3 Oct 2020 14:26:59 -0600
Subject: [PATCH] expander: make cache accomodate optional directory path
 terminator

The cache is sensitive to `current-load-relative-directory`, but
normalize with `path->directory-path`.
---
 .../racket-test-core/tests/racket/module.rktl |  22 +-
 .../tests/racket/parallel.rkt                 |  60 ++
 .../tests/racket/parallel.rktl                |   3 +
 pkgs/racket-test-core/tests/racket/param.rktl |   4 +-
 pkgs/racket-test-core/tests/racket/port.rktl  |   2 +-
 .../tests/racket/submodule.rktl               |  13 +-
 racket/src/bc/src/startup.inc                 |   5 +-
 racket/src/cs/schemified/expander.scm         | 518 +++++++++---------
 racket/src/expander/eval/module-cache.rkt     |   3 +-
 9 files changed, 349 insertions(+), 281 deletions(-)
 create mode 100644 pkgs/racket-test-core/tests/racket/parallel.rkt

diff --git a/pkgs/racket-test-core/tests/racket/module.rktl b/pkgs/racket-test-core/tests/racket/module.rktl
index ae0526e570..26acc72021 100644
--- a/pkgs/racket-test-core/tests/racket/module.rktl
+++ b/pkgs/racket-test-core/tests/racket/module.rktl
@@ -1073,10 +1073,9 @@
   (define am-s (compile-m (a-expr #t) '()))
   (define b-s (compile-m b-expr (list a-s)))
 
-  (define temp-dir (find-system-path 'temp-dir))
+  (define temp-dir (make-temporary-file "comp~a" 'directory))
   (define dir (build-path temp-dir (car (use-compiled-file-paths))))
-  (define dir-existed? (directory-exists? dir))
-  (unless dir-existed? (make-directory* dir))
+  (make-directory* dir)
 
   (define (go a-s)
     (parameterize ([current-namespace (make-base-namespace)]
@@ -1091,8 +1090,7 @@
   ;; Check that we don't crash when trying to use a different `a':
   (err/rt-test (go am-s) exn:fail?)
   ;; Cleanup
-  (delete-file (build-path dir "check-gen_rkt.zo"))
-  (unless dir-existed? (delete-directory dir)))
+  (delete-directory/files temp-dir))
 
 ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
@@ -1425,7 +1423,7 @@ case of module-leve bindings; it doesn't cover local bindings.
     [else (error "unknown")]))
 
 (let ()
-  (define dir (find-system-path 'temp-dir))
+  (define dir (make-temporary-file "tmx~a" 'directory))
   (define tmx (build-path dir "tmx.rkt"))
   (define e (compile '(module tmx racket/base
                         (module s racket/base
@@ -1454,11 +1452,11 @@ case of module-leve bindings; it doesn't cover local bindings.
     (dynamic-require tmx #f)
     (test #f module-declared? `(submod ,tmx s) #f)
     (test 1 dynamic-require `(submod ,tmx s) 'x))
-  (delete-file zo-path))
+  (delete-directory/files dir))
 
 ;; Check that module-code caching works
 (let ()
-  (define dir (find-system-path 'temp-dir))
+  (define dir (make-temporary-file "tmx~a" 'directory))
   (define tmx (build-path dir "tmx2.rkt"))
   (define e (compile '(module tmx2 racket/kernel
                         (#%provide x)
@@ -1483,7 +1481,6 @@ case of module-leve bindings; it doesn't cover local bindings.
                  [current-load-relative-directory dir])
     (eval (parameterize ([read-accept-compiled #t])
             (read (open-input-bytes bstr)))))
-
   ;; Mangle the bytecode file; cached variant should be used:
   (call-with-output-file zo-path
     #:exists 'update
@@ -1492,12 +1489,15 @@ case of module-leve bindings; it doesn't cover local bindings.
       (write-bytes (make-bytes 100 (char->integer #\!)) o)))
 
   (test 2 add1
-        (parameterize ([current-namespace (make-base-namespace)])
+        (parameterize ([current-namespace (make-base-namespace)]
+                       [current-load-relative-directory dir])
           (dynamic-require tmx 'x)))
   (delete-file zo-path)
 
   ;; Need to retain the namespace until here
-  (ephemeron-value (make-ephemeron first-namespace 7) first-namespace))
+  (ephemeron-value (make-ephemeron first-namespace 7) first-namespace)
+
+  (delete-directory/files dir))
 
 ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Check that `provide` doesn't run enclosed expanders until within a
diff --git a/pkgs/racket-test-core/tests/racket/parallel.rkt b/pkgs/racket-test-core/tests/racket/parallel.rkt
new file mode 100644
index 0000000000..f2517b2617
--- /dev/null
+++ b/pkgs/racket-test-core/tests/racket/parallel.rkt
@@ -0,0 +1,60 @@
+#lang racket/base
+(require racket/place)
+
+;; Runs multiple places perfoming the test suite simultaneously. Each
+;; place creates a directory sub<n> to run in, so that filesystem
+;; tests don't collide.
+
+;; Note that the old "parallel.rktl" runs multiple threads instead of
+;; multiple places.
+
+(define (go)
+  (place
+   pch
+   (define n (place-channel-get pch))
+   (define quiet (place-channel-get pch))
+   (define all (place-channel-get pch))
+   (let ([ns (make-base-namespace)]
+         [eh (exit-handler)]
+         [ql all])
+     (parameterize ([current-namespace ns])
+       (namespace-require '(lib "racket/init"))
+       (eval `(define Section-prefix ,(format "~a:" n)))
+       (when ql
+         (eval `(define quiet-load (quote ,ql))))
+       (let ([dirname (path->complete-path (format "sub~s" n))])
+         (when (directory-exists? dirname)
+           (delete-directory* dirname))
+         (make-directory dirname)
+         (current-directory dirname)
+           (load quiet)
+           (current-directory (build-path dirname 'up))
+           (delete-directory* dirname))))))
+
+(define (delete-directory* dir)
+  (for-each (lambda (f)
+	      (let ([f (build-path dir f)])
+		(if (or (link-exists? f) (file-exists? f))
+		    (delete-file f)
+		    (delete-directory* f))))
+	    (directory-list dir))
+  (delete-directory dir))
+
+(module+ main
+  (define (parallel n quiet all)
+    (define places
+      (for/list ([i n])
+        (define p (go))
+        (place-channel-put p i)
+        (place-channel-put p quiet)
+        (place-channel-put p all)
+        p))
+    (for-each place-wait places))
+  
+  (parallel 3
+            (path->complete-path "quiet.rktl")
+            (path->complete-path "all.rktl"))
+  (exit 0))
+
+(module+ test
+  (require (submod ".." main)))
diff --git a/pkgs/racket-test-core/tests/racket/parallel.rktl b/pkgs/racket-test-core/tests/racket/parallel.rktl
index d9110105ca..07e54c3975 100644
--- a/pkgs/racket-test-core/tests/racket/parallel.rktl
+++ b/pkgs/racket-test-core/tests/racket/parallel.rktl
@@ -3,6 +3,9 @@
 ;;  thread creates a directory sub<n> to run in, so that filesystem
 ;;  tests don't collide.
 
+;; Note that the newer "parallel.rktl" runs multiple places instead
+;; of multiple threads.
+
 (namespace-variable-value 'parallel-load #f
                           (lambda ()
                             (namespace-set-variable-value! 'parallel-load "quiet.rktl")))
diff --git a/pkgs/racket-test-core/tests/racket/param.rktl b/pkgs/racket-test-core/tests/racket/param.rktl
index 259d450bef..b4146cb767 100644
--- a/pkgs/racket-test-core/tests/racket/param.rktl
+++ b/pkgs/racket-test-core/tests/racket/param.rktl
@@ -3,8 +3,10 @@
 
 (Section 'parameters)
 
+(require racket/file)
+
 (define temp-compiled-file
-  (path->string (build-path (find-system-path 'temp-dir) "param-temp-file")))
+  (path->string (make-temporary-file "param-temp-file~a")))
 
 (let ([p (open-output-file temp-compiled-file #:exists 'replace)])
   (display (compile '(cons 1 2)) p)
diff --git a/pkgs/racket-test-core/tests/racket/port.rktl b/pkgs/racket-test-core/tests/racket/port.rktl
index a01c444733..2d475a5ebb 100644
--- a/pkgs/racket-test-core/tests/racket/port.rktl
+++ b/pkgs/racket-test-core/tests/racket/port.rktl
@@ -978,7 +978,7 @@
 ;; Text mode, file positions, and buffers
 
 (let ()
-  (define path (build-path (find-system-path 'temp-dir) "test.txt"))
+  (define path (make-temporary-file "test~a.txt"))
 
   (define ofile (open-output-file path #:mode 'text #:exists 'replace))
   (fprintf ofile "abc\ndef\nghi\n")
diff --git a/pkgs/racket-test-core/tests/racket/submodule.rktl b/pkgs/racket-test-core/tests/racket/submodule.rktl
index 7f0c193206..f3bb4f8a84 100644
--- a/pkgs/racket-test-core/tests/racket/submodule.rktl
+++ b/pkgs/racket-test-core/tests/racket/submodule.rktl
@@ -3,6 +3,8 @@
 
 (Section 'submodule)
 
+(require racket/file)
+
 ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (test #t module-path? '(submod "."))
@@ -634,10 +636,7 @@
 ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Directory for testing
 
-(define temp-dir
-  (build-path (find-system-path 'temp-dir)
-              (format "submodule-tests-~s" (current-seconds))))
-(make-directory temp-dir)
+(define temp-dir (make-temporary-file "submodule-tests-~s" 'directory))
 
 ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Check submodule resolution of relative paths:
@@ -700,11 +699,7 @@
 ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Delete the temp-dir
 
-(let loop ([x temp-dir])
-  (cond [(file-exists? x) (delete-file x)]
-        [(directory-exists? x) (parameterize ([current-directory x])
-                                 (for-each loop (directory-list)))
-                               (delete-directory x)]))
+(delete-directory/files temp-dir)
 
 ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Module attach
diff --git a/racket/src/bc/src/startup.inc b/racket/src/bc/src/startup.inc
index 5c175ebd55..30226745b0 100644
--- a/racket/src/bc/src/startup.inc
+++ b/racket/src/bc/src/startup.inc
@@ -38628,7 +38628,10 @@ static const char *startup_source =
 "(define-values"
 "(make-module-cache-key)"
 "(lambda(hash-code_0)"
-"    (begin (if hash-code_0 (string->symbol (format \"~s\" (list hash-code_0 (current-load-relative-directory)))) #f))))"
+"(begin"
+"(if hash-code_0"
+"        (string->symbol (format \"~s\" (list hash-code_0 (path->directory-path (current-load-relative-directory)))))"
+" #f))))"
 "(define-values"
 "(module-cache-set!)"
 "(lambda(key_0 proc_0)(begin(hash-set!(unsafe-place-local-ref cell.1$3) key_0(make-ephemeron key_0 proc_0)))))"
diff --git a/racket/src/cs/schemified/expander.scm b/racket/src/cs/schemified/expander.scm
index 2494e9ebab..b2abb7b3f7 100644
--- a/racket/src/cs/schemified/expander.scm
+++ b/racket/src/cs/schemified/expander.scm
@@ -46068,7 +46068,11 @@
   (lambda (hash-code_0)
     (if hash-code_0
       (string->symbol
-       (format "~s" (list hash-code_0 (current-load-relative-directory))))
+       (format
+        "~s"
+        (list
+         hash-code_0
+         (path->directory-path (current-load-relative-directory)))))
       #f)))
 (define module-cache-set!
   (lambda (key_0 proc_0)
@@ -46727,7 +46731,7 @@
                (if log-performance? (end-performance-region) (void))))))))))
 (define struct:instance-data
   (make-record-type-descriptor* 'instance-data #f #f #f #f 2 3))
-(define effect5121
+(define effect5122
   (struct-type-install-properties!
    struct:instance-data
    'instance-data
@@ -46745,19 +46749,19 @@
    instance-data
    (record-constructor
     (make-record-constructor-descriptor struct:instance-data #f #f))))
-(define instance-data?5120
+(define instance-data?5121
   (|#%name| instance-data? (record-predicate struct:instance-data)))
 (define instance-data?
   (|#%name|
    instance-data?
    (lambda (v)
-     (if (instance-data?5120 v)
+     (if (instance-data?5121 v)
        #t
        ($value
         (if (impersonator? v)
-          (instance-data?5120 (impersonator-val v))
+          (instance-data?5121 (impersonator-val v))
           #f))))))
-(define instance-data-syntax-literals-instance5122
+(define instance-data-syntax-literals-instance5123
   (|#%name|
    instance-data-syntax-literals-instance
    (record-accessor struct:instance-data 0)))
@@ -46765,33 +46769,33 @@
   (|#%name|
    instance-data-syntax-literals-instance
    (lambda (s)
-     (if (instance-data?5120 s)
-       (instance-data-syntax-literals-instance5122 s)
+     (if (instance-data?5121 s)
+       (instance-data-syntax-literals-instance5123 s)
        ($value
         (impersonate-ref
-         instance-data-syntax-literals-instance5122
+         instance-data-syntax-literals-instance5123
          struct:instance-data
          0
          s
          'instance-data
          'syntax-literals-instance))))))
-(define instance-data-cache-key5123
+(define instance-data-cache-key5124
   (|#%name| instance-data-cache-key (record-accessor struct:instance-data 1)))
 (define instance-data-cache-key
   (|#%name|
    instance-data-cache-key
    (lambda (s)
-     (if (instance-data?5120 s)
-       (instance-data-cache-key5123 s)
+     (if (instance-data?5121 s)
+       (instance-data-cache-key5124 s)
        ($value
         (impersonate-ref
-         instance-data-cache-key5123
+         instance-data-cache-key5124
          struct:instance-data
          1
          s
          'instance-data
          'cache-key))))))
-(define effect5124
+(define effect5125
   (begin
     (register-struct-constructor! instance-data9.1)
     (register-struct-predicate! instance-data?)
@@ -49171,7 +49175,7 @@
         c_0))))
 (define struct:recompiled
   (make-record-type-descriptor* 'recompiled #f #f #f #f 3 7))
-(define effect5377
+(define effect5378
   (struct-type-install-properties!
    struct:recompiled
    'recompiled
@@ -49199,7 +49203,7 @@
    (record-accessor struct:recompiled 1)))
 (define recompiled-self
   (|#%name| recompiled-self (record-accessor struct:recompiled 2)))
-(define effect5378
+(define effect5379
   (begin
     (register-struct-constructor! recompiled1.1)
     (register-struct-predicate! recompiled?)
@@ -50679,7 +50683,7 @@
               sym_0)))
         (let ((temp1_1 temp1_0))
           (add-binding-in-scopes!.1 #f temp1_1 sym_0 temp3_0))))))
-(define effect5512
+(define effect5513
   (begin
     (void
      (begin
@@ -50706,7 +50710,7 @@
   (lambda (b_0) (begin0 (reverse$1 (unbox b_0)) (set-box! b_0 null))))
 (define struct:lift-context
   (make-record-type-descriptor* 'lift-context #f #f #f #f 3 7))
-(define effect5516
+(define effect5517
   (struct-type-install-properties!
    struct:lift-context
    'lift-context
@@ -50732,7 +50736,7 @@
   (|#%name| lift-context-lifts (record-accessor struct:lift-context 1)))
 (define lift-context-module*-ok?
   (|#%name| lift-context-module*-ok? (record-accessor struct:lift-context 2)))
-(define effect5517
+(define effect5518
   (begin
     (register-struct-constructor! lift-context1.1)
     (register-struct-predicate! lift-context?)
@@ -50748,7 +50752,7 @@
     (void)))
 (define struct:lifted-bind
   (make-record-type-descriptor* 'lifted-bind #f #f #f #f 3 7))
-(define effect5518
+(define effect5519
   (struct-type-install-properties!
    struct:lifted-bind
    'lifted-bind
@@ -50774,7 +50778,7 @@
   (|#%name| lifted-bind-keys (record-accessor struct:lifted-bind 1)))
 (define lifted-bind-rhs
   (|#%name| lifted-bind-rhs (record-accessor struct:lifted-bind 2)))
-(define effect5519
+(define effect5520
   (begin
     (register-struct-constructor! lifted-bind2.1)
     (register-struct-predicate! lifted-bind?)
@@ -51007,7 +51011,7 @@
         (for-loop_0 null lifts_0))))))
 (define struct:module-lift-context
   (make-record-type-descriptor* 'module-lift-context #f #f #f #f 3 7))
-(define effect5563
+(define effect5564
   (struct-type-install-properties!
    struct:module-lift-context
    'module-lift-context
@@ -51041,7 +51045,7 @@
   (|#%name|
    module-lift-context-module*-ok?
    (record-accessor struct:module-lift-context 2)))
-(define effect5564
+(define effect5565
   (begin
     (register-struct-constructor! module-lift-context15.1)
     (register-struct-predicate! module-lift-context?)
@@ -51099,7 +51103,7 @@
            "internal error: unrecognized lift-context type for module lift"))))))
 (define struct:require-lift-context
   (make-record-type-descriptor* 'require-lift-context #f #f #f #f 3 7))
-(define effect5568
+(define effect5569
   (struct-type-install-properties!
    struct:require-lift-context
    'require-lift-context
@@ -51133,7 +51137,7 @@
   (|#%name|
    require-lift-context-requires
    (record-accessor struct:require-lift-context 2)))
-(define effect5569
+(define effect5570
   (begin
     (register-struct-constructor! require-lift-context16.1)
     (register-struct-predicate! require-lift-context?)
@@ -51163,7 +51167,7 @@
       (box-cons! (require-lift-context-requires require-lifts_0) s_0))))
 (define struct:to-module-lift-context
   (make-record-type-descriptor* 'to-module-lift-context #f #f #f #f 4 15))
-(define effect5573
+(define effect5574
   (struct-type-install-properties!
    struct:to-module-lift-context
    'to-module-lift-context
@@ -51201,7 +51205,7 @@
   (|#%name|
    to-module-lift-context-ends
    (record-accessor struct:to-module-lift-context 3)))
-(define effect5574
+(define effect5575
   (begin
     (register-struct-constructor! to-module-lift-context17.1)
     (register-struct-predicate! to-module-lift-context?)
@@ -51247,7 +51251,7 @@
     (box-cons! (to-module-lift-context-ends to-module-lifts_0) s_0)))
 (define struct:already-expanded
   (make-record-type-descriptor* 'expanded-syntax #f #f #f #f 2 3))
-(define effect5580
+(define effect5581
   (struct-type-install-properties!
    struct:already-expanded
    'expanded-syntax
@@ -51265,35 +51269,35 @@
    already-expanded
    (record-constructor
     (make-record-constructor-descriptor struct:already-expanded #f #f))))
-(define already-expanded?5579
+(define already-expanded?5580
   (|#%name| expanded-syntax? (record-predicate struct:already-expanded)))
 (define already-expanded?
   (|#%name|
    expanded-syntax?
    (lambda (v)
-     (if (already-expanded?5579 v)
+     (if (already-expanded?5580 v)
        #t
        ($value
         (if (impersonator? v)
-          (already-expanded?5579 (impersonator-val v))
+          (already-expanded?5580 (impersonator-val v))
           #f))))))
-(define already-expanded-s5581
+(define already-expanded-s5582
   (|#%name| expanded-syntax-s (record-accessor struct:already-expanded 0)))
 (define already-expanded-s
   (|#%name|
    expanded-syntax-s
    (lambda (s)
-     (if (already-expanded?5579 s)
-       (already-expanded-s5581 s)
+     (if (already-expanded?5580 s)
+       (already-expanded-s5582 s)
        ($value
         (impersonate-ref
-         already-expanded-s5581
+         already-expanded-s5582
          struct:already-expanded
          0
          s
          'expanded-syntax
          's))))))
-(define already-expanded-binding-layer5582
+(define already-expanded-binding-layer5583
   (|#%name|
    expanded-syntax-binding-layer
    (record-accessor struct:already-expanded 1)))
@@ -51301,17 +51305,17 @@
   (|#%name|
    expanded-syntax-binding-layer
    (lambda (s)
-     (if (already-expanded?5579 s)
-       (already-expanded-binding-layer5582 s)
+     (if (already-expanded?5580 s)
+       (already-expanded-binding-layer5583 s)
        ($value
         (impersonate-ref
-         already-expanded-binding-layer5582
+         already-expanded-binding-layer5583
          struct:already-expanded
          1
          s
          'expanded-syntax
          'binding-layer))))))
-(define effect5583
+(define effect5584
   (begin
     (register-struct-constructor! already-expanded1.1)
     (register-struct-predicate! already-expanded?)
@@ -51331,7 +51335,7 @@
  (make-struct-type-property 'liberal-define-context))
 (define struct:liberal-define-context
   (make-record-type-descriptor* 'liberal-define-context #f #f #f #f 0 0))
-(define effect5585
+(define effect5586
   (struct-type-install-properties!
    struct:liberal-define-context
    'liberal-define-context
@@ -51349,7 +51353,7 @@
    make-liberal-define-context
    (record-constructor
     (make-record-constructor-descriptor struct:liberal-define-context #f #f))))
-(define 1/liberal-define-context?5584
+(define 1/liberal-define-context?5585
   (|#%name|
    liberal-define-context?
    (record-predicate struct:liberal-define-context)))
@@ -51357,13 +51361,13 @@
   (|#%name|
    liberal-define-context?
    (lambda (v)
-     (if (1/liberal-define-context?5584 v)
+     (if (1/liberal-define-context?5585 v)
        #t
        ($value
         (if (impersonator? v)
-          (1/liberal-define-context?5584 (impersonator-val v))
+          (1/liberal-define-context?5585 (impersonator-val v))
           #f))))))
-(define effect5586
+(define effect5587
   (begin
     (register-struct-constructor! make-liberal-define-context)
     (register-struct-predicate! 1/liberal-define-context?)
@@ -51458,7 +51462,7 @@
             (fail_0 ctx_0 s_0)))))))
 (define struct:reference-record
   (make-record-type-descriptor* 'reference-record #f #f #f #f 3 7))
-(define effect5605
+(define effect5606
   (struct-type-install-properties!
    struct:reference-record
    'reference-record
@@ -51502,7 +51506,7 @@
   (|#%name|
    set-reference-record-all-referenced?!
    (record-mutator struct:reference-record 2)))
-(define effect5606
+(define effect5607
   (begin
     (register-struct-constructor! reference-record1.1)
     (register-struct-predicate! reference-record?)
@@ -51639,7 +51643,7 @@
         orig-s3_0)))))
 (define struct:expanded+parsed
   (make-record-type-descriptor* 'expanded+parsed #f #f #f #f 2 3))
-(define effect5629
+(define effect5630
   (struct-type-install-properties!
    struct:expanded+parsed
    'expanded+parsed
@@ -51663,7 +51667,7 @@
   (|#%name| expanded+parsed-s (record-accessor struct:expanded+parsed 0)))
 (define expanded+parsed-parsed
   (|#%name| expanded+parsed-parsed (record-accessor struct:expanded+parsed 1)))
-(define effect5630
+(define effect5631
   (begin
     (register-struct-constructor! expanded+parsed1.1)
     (register-struct-predicate! expanded+parsed?)
@@ -51678,7 +51682,7 @@
     (void)))
 (define struct:semi-parsed-define-values
   (make-record-type-descriptor* 'semi-parsed-define-values #f #f #f #f 4 15))
-(define effect5631
+(define effect5632
   (struct-type-install-properties!
    struct:semi-parsed-define-values
    'semi-parsed-define-values
@@ -51719,7 +51723,7 @@
   (|#%name|
    semi-parsed-define-values-rhs
    (record-accessor struct:semi-parsed-define-values 3)))
-(define effect5632
+(define effect5633
   (begin
     (register-struct-constructor! semi-parsed-define-values2.1)
     (register-struct-predicate! semi-parsed-define-values?)
@@ -51742,7 +51746,7 @@
     (void)))
 (define struct:semi-parsed-begin-for-syntax
   (make-record-type-descriptor* 'semi-parsed-begin-for-syntax #f #f #f #f 2 3))
-(define effect5633
+(define effect5634
   (struct-type-install-properties!
    struct:semi-parsed-begin-for-syntax
    'semi-parsed-begin-for-syntax
@@ -51775,7 +51779,7 @@
   (|#%name|
    semi-parsed-begin-for-syntax-body
    (record-accessor struct:semi-parsed-begin-for-syntax 1)))
-(define effect5634
+(define effect5635
   (begin
     (register-struct-constructor! semi-parsed-begin-for-syntax3.1)
     (register-struct-predicate! semi-parsed-begin-for-syntax?)
@@ -53962,7 +53966,7 @@
      |#%stratified-body|)))
 (define struct:internal-definition-context
   (make-record-type-descriptor* 'internal-definition-context #f #f #f #f 5 31))
-(define effect6093
+(define effect6094
   (struct-type-install-properties!
    struct:internal-definition-context
    'internal-definition-context
@@ -53983,7 +53987,7 @@
      struct:internal-definition-context
      #f
      #f))))
-(define 1/internal-definition-context?6092
+(define 1/internal-definition-context?6093
   (|#%name|
    internal-definition-context?
    (record-predicate struct:internal-definition-context)))
@@ -53991,13 +53995,13 @@
   (|#%name|
    internal-definition-context?
    (lambda (v)
-     (if (1/internal-definition-context?6092 v)
+     (if (1/internal-definition-context?6093 v)
        #t
        ($value
         (if (impersonator? v)
-          (1/internal-definition-context?6092 (impersonator-val v))
+          (1/internal-definition-context?6093 (impersonator-val v))
           #f))))))
-(define internal-definition-context-frame-id6094
+(define internal-definition-context-frame-id6095
   (|#%name|
    internal-definition-context-frame-id
    (record-accessor struct:internal-definition-context 0)))
@@ -54005,17 +54009,17 @@
   (|#%name|
    internal-definition-context-frame-id
    (lambda (s)
-     (if (1/internal-definition-context?6092 s)
-       (internal-definition-context-frame-id6094 s)
+     (if (1/internal-definition-context?6093 s)
+       (internal-definition-context-frame-id6095 s)
        ($value
         (impersonate-ref
-         internal-definition-context-frame-id6094
+         internal-definition-context-frame-id6095
          struct:internal-definition-context
          0
          s
          'internal-definition-context
          'frame-id))))))
-(define internal-definition-context-scope6095
+(define internal-definition-context-scope6096
   (|#%name|
    internal-definition-context-scope
    (record-accessor struct:internal-definition-context 1)))
@@ -54023,17 +54027,17 @@
   (|#%name|
    internal-definition-context-scope
    (lambda (s)
-     (if (1/internal-definition-context?6092 s)
-       (internal-definition-context-scope6095 s)
+     (if (1/internal-definition-context?6093 s)
+       (internal-definition-context-scope6096 s)
        ($value
         (impersonate-ref
-         internal-definition-context-scope6095
+         internal-definition-context-scope6096
          struct:internal-definition-context
          1
          s
          'internal-definition-context
          'scope))))))
-(define internal-definition-context-add-scope?6096
+(define internal-definition-context-add-scope?6097
   (|#%name|
    internal-definition-context-add-scope?
    (record-accessor struct:internal-definition-context 2)))
@@ -54041,17 +54045,17 @@
   (|#%name|
    internal-definition-context-add-scope?
    (lambda (s)
-     (if (1/internal-definition-context?6092 s)
-       (internal-definition-context-add-scope?6096 s)
+     (if (1/internal-definition-context?6093 s)
+       (internal-definition-context-add-scope?6097 s)
        ($value
         (impersonate-ref
-         internal-definition-context-add-scope?6096
+         internal-definition-context-add-scope?6097
          struct:internal-definition-context
          2
          s
          'internal-definition-context
          'add-scope?))))))
-(define internal-definition-context-env-mixins6097
+(define internal-definition-context-env-mixins6098
   (|#%name|
    internal-definition-context-env-mixins
    (record-accessor struct:internal-definition-context 3)))
@@ -54059,17 +54063,17 @@
   (|#%name|
    internal-definition-context-env-mixins
    (lambda (s)
-     (if (1/internal-definition-context?6092 s)
-       (internal-definition-context-env-mixins6097 s)
+     (if (1/internal-definition-context?6093 s)
+       (internal-definition-context-env-mixins6098 s)
        ($value
         (impersonate-ref
-         internal-definition-context-env-mixins6097
+         internal-definition-context-env-mixins6098
          struct:internal-definition-context
          3
          s
          'internal-definition-context
          'env-mixins))))))
-(define internal-definition-context-parent-ctx6098
+(define internal-definition-context-parent-ctx6099
   (|#%name|
    internal-definition-context-parent-ctx
    (record-accessor struct:internal-definition-context 4)))
@@ -54077,17 +54081,17 @@
   (|#%name|
    internal-definition-context-parent-ctx
    (lambda (s)
-     (if (1/internal-definition-context?6092 s)
-       (internal-definition-context-parent-ctx6098 s)
+     (if (1/internal-definition-context?6093 s)
+       (internal-definition-context-parent-ctx6099 s)
        ($value
         (impersonate-ref
-         internal-definition-context-parent-ctx6098
+         internal-definition-context-parent-ctx6099
          struct:internal-definition-context
          4
          s
          'internal-definition-context
          'parent-ctx))))))
-(define effect6099
+(define effect6100
   (begin
     (register-struct-constructor! internal-definition-context1.1)
     (register-struct-predicate! 1/internal-definition-context?)
@@ -54114,7 +54118,7 @@
     (void)))
 (define struct:env-mixin
   (make-record-type-descriptor* 'env-mixin #f #f #f #f 4 15))
-(define effect6101
+(define effect6102
   (struct-type-install-properties!
    struct:env-mixin
    'env-mixin
@@ -54132,81 +54136,81 @@
    env-mixin
    (record-constructor
     (make-record-constructor-descriptor struct:env-mixin #f #f))))
-(define env-mixin?6100
+(define env-mixin?6101
   (|#%name| env-mixin? (record-predicate struct:env-mixin)))
 (define env-mixin?
   (|#%name|
    env-mixin?
    (lambda (v)
-     (if (env-mixin?6100 v)
+     (if (env-mixin?6101 v)
        #t
        ($value
-        (if (impersonator? v) (env-mixin?6100 (impersonator-val v)) #f))))))
-(define env-mixin-id6102
+        (if (impersonator? v) (env-mixin?6101 (impersonator-val v)) #f))))))
+(define env-mixin-id6103
   (|#%name| env-mixin-id (record-accessor struct:env-mixin 0)))
 (define env-mixin-id
   (|#%name|
    env-mixin-id
    (lambda (s)
-     (if (env-mixin?6100 s)
-       (env-mixin-id6102 s)
+     (if (env-mixin?6101 s)
+       (env-mixin-id6103 s)
        ($value
         (impersonate-ref
-         env-mixin-id6102
+         env-mixin-id6103
          struct:env-mixin
          0
          s
          'env-mixin
          'id))))))
-(define env-mixin-sym6103
+(define env-mixin-sym6104
   (|#%name| env-mixin-sym (record-accessor struct:env-mixin 1)))
 (define env-mixin-sym
   (|#%name|
    env-mixin-sym
    (lambda (s)
-     (if (env-mixin?6100 s)
-       (env-mixin-sym6103 s)
+     (if (env-mixin?6101 s)
+       (env-mixin-sym6104 s)
        ($value
         (impersonate-ref
-         env-mixin-sym6103
+         env-mixin-sym6104
          struct:env-mixin
          1
          s
          'env-mixin
          'sym))))))
-(define env-mixin-value6104
+(define env-mixin-value6105
   (|#%name| env-mixin-value (record-accessor struct:env-mixin 2)))
 (define env-mixin-value
   (|#%name|
    env-mixin-value
    (lambda (s)
-     (if (env-mixin?6100 s)
-       (env-mixin-value6104 s)
+     (if (env-mixin?6101 s)
+       (env-mixin-value6105 s)
        ($value
         (impersonate-ref
-         env-mixin-value6104
+         env-mixin-value6105
          struct:env-mixin
          2
          s
          'env-mixin
          'value))))))
-(define env-mixin-cache6105
+(define env-mixin-cache6106
   (|#%name| env-mixin-cache (record-accessor struct:env-mixin 3)))
 (define env-mixin-cache
   (|#%name|
    env-mixin-cache
    (lambda (s)
-     (if (env-mixin?6100 s)
-       (env-mixin-cache6105 s)
+     (if (env-mixin?6101 s)
+       (env-mixin-cache6106 s)
        ($value
         (impersonate-ref
-         env-mixin-cache6105
+         env-mixin-cache6106
          struct:env-mixin
          3
          s
          'env-mixin
          'cache))))))
-(define effect6106
+(define effect6107
   (begin
     (register-struct-constructor! env-mixin2.1)
     (register-struct-predicate! env-mixin?)
@@ -58944,7 +58948,7 @@
       ((s_0 ns7_0) (compile_0 s_0 ns7_0 #t unsafe-undefined))))))
 (define struct:lifted-parsed-begin
   (make-record-type-descriptor* 'lifted-parsed-begin #f #f #f #f 2 3))
-(define effect6579
+(define effect6580
   (struct-type-install-properties!
    struct:lifted-parsed-begin
    'lifted-parsed-begin
@@ -58962,7 +58966,7 @@
    lifted-parsed-begin
    (record-constructor
     (make-record-constructor-descriptor struct:lifted-parsed-begin #f #f))))
-(define lifted-parsed-begin?6578
+(define lifted-parsed-begin?6579
   (|#%name|
    lifted-parsed-begin?
    (record-predicate struct:lifted-parsed-begin)))
@@ -58970,13 +58974,13 @@
   (|#%name|
    lifted-parsed-begin?
    (lambda (v)
-     (if (lifted-parsed-begin?6578 v)
+     (if (lifted-parsed-begin?6579 v)
        #t
        ($value
         (if (impersonator? v)
-          (lifted-parsed-begin?6578 (impersonator-val v))
+          (lifted-parsed-begin?6579 (impersonator-val v))
           #f))))))
-(define lifted-parsed-begin-seq6580
+(define lifted-parsed-begin-seq6581
   (|#%name|
    lifted-parsed-begin-seq
    (record-accessor struct:lifted-parsed-begin 0)))
@@ -58984,17 +58988,17 @@
   (|#%name|
    lifted-parsed-begin-seq
    (lambda (s)
-     (if (lifted-parsed-begin?6578 s)
-       (lifted-parsed-begin-seq6580 s)
+     (if (lifted-parsed-begin?6579 s)
+       (lifted-parsed-begin-seq6581 s)
        ($value
         (impersonate-ref
-         lifted-parsed-begin-seq6580
+         lifted-parsed-begin-seq6581
          struct:lifted-parsed-begin
          0
          s
          'lifted-parsed-begin
          'seq))))))
-(define lifted-parsed-begin-last6581
+(define lifted-parsed-begin-last6582
   (|#%name|
    lifted-parsed-begin-last
    (record-accessor struct:lifted-parsed-begin 1)))
@@ -59002,17 +59006,17 @@
   (|#%name|
    lifted-parsed-begin-last
    (lambda (s)
-     (if (lifted-parsed-begin?6578 s)
-       (lifted-parsed-begin-last6581 s)
+     (if (lifted-parsed-begin?6579 s)
+       (lifted-parsed-begin-last6582 s)
        ($value
         (impersonate-ref
-         lifted-parsed-begin-last6581
+         lifted-parsed-begin-last6582
          struct:lifted-parsed-begin
          1
          s
          'lifted-parsed-begin
          'last))))))
-(define effect6582
+(define effect6583
   (begin
     (register-struct-constructor! lifted-parsed-begin11.1)
     (register-struct-predicate! lifted-parsed-begin?)
@@ -61639,7 +61643,7 @@
      (|#%app| thunk_0))))
 (define struct:shadow-directory
   (make-record-type-descriptor* 'shadow-directory #f #f #f #f 2 3))
-(define effect6889
+(define effect6890
   (struct-type-install-properties!
    struct:shadow-directory
    'shadow-directory
@@ -61665,7 +61669,7 @@
   (|#%name|
    shadow-directory-table
    (record-accessor struct:shadow-directory 1)))
-(define effect6890
+(define effect6891
   (begin
     (register-struct-constructor! shadow-directory1.1)
     (register-struct-predicate! shadow-directory?)
@@ -62516,7 +62520,7 @@
    'current-readtable))
 (define struct:read-config/outer
   (make-record-type-descriptor* 'read-config #f #f #f #f 7 127))
-(define effect7054
+(define effect7055
   (struct-type-install-properties!
    struct:read-config/outer
    'read-config
@@ -62554,7 +62558,7 @@
   (|#%name|
    read-config-keep-comment?
    (record-accessor struct:read-config/outer 6)))
-(define effect7055
+(define effect7056
   (begin
     (register-struct-constructor! read-config/outer1.1)
     (register-struct-predicate! read-config/outer?)
@@ -62589,7 +62593,7 @@
     (void)))
 (define struct:read-config/inner
   (make-record-type-descriptor* 'read-config/inner #f #f #f #f 13 8191))
-(define effect7056
+(define effect7057
   (struct-type-install-properties!
    struct:read-config/inner
    'read-config/inner
@@ -62661,7 +62665,7 @@
   (|#%name|
    read-config/inner-st
    (record-accessor struct:read-config/inner 12)))
-(define effect7057
+(define effect7058
   (begin
     (register-struct-constructor! read-config/inner2.1)
     (register-struct-predicate! read-config/inner?)
@@ -62803,7 +62807,7 @@
   (lambda (v_0) (read-config/inner-st (read-config/outer-inner v_0))))
 (define struct:read-config-state
   (make-record-type-descriptor* 'read-config-state #f #f #f #f 2 3))
-(define effect7072
+(define effect7073
   (struct-type-install-properties!
    struct:read-config-state
    'read-config-state
@@ -62821,19 +62825,19 @@
    read-config-state
    (record-constructor
     (make-record-constructor-descriptor struct:read-config-state #f #f))))
-(define read-config-state?7071
+(define read-config-state?7072
   (|#%name| read-config-state? (record-predicate struct:read-config-state)))
 (define read-config-state?
   (|#%name|
    read-config-state?
    (lambda (v)
-     (if (read-config-state?7071 v)
+     (if (read-config-state?7072 v)
        #t
        ($value
         (if (impersonator? v)
-          (read-config-state?7071 (impersonator-val v))
+          (read-config-state?7072 (impersonator-val v))
           #f))))))
-(define read-config-state-accum-str7073
+(define read-config-state-accum-str7074
   (|#%name|
    read-config-state-accum-str
    (record-accessor struct:read-config-state 0)))
@@ -62841,17 +62845,17 @@
   (|#%name|
    read-config-state-accum-str
    (lambda (s)
-     (if (read-config-state?7071 s)
-       (read-config-state-accum-str7073 s)
+     (if (read-config-state?7072 s)
+       (read-config-state-accum-str7074 s)
        ($value
         (impersonate-ref
-         read-config-state-accum-str7073
+         read-config-state-accum-str7074
          struct:read-config-state
          0
          s
          'read-config-state
          'accum-str))))))
-(define read-config-state-graph7074
+(define read-config-state-graph7075
   (|#%name|
    read-config-state-graph
    (record-accessor struct:read-config-state 1)))
@@ -62859,17 +62863,17 @@
   (|#%name|
    read-config-state-graph
    (lambda (s)
-     (if (read-config-state?7071 s)
-       (read-config-state-graph7074 s)
+     (if (read-config-state?7072 s)
+       (read-config-state-graph7075 s)
        ($value
         (impersonate-ref
-         read-config-state-graph7074
+         read-config-state-graph7075
          struct:read-config-state
          1
          s
          'read-config-state
          'graph))))))
-(define set-read-config-state-accum-str!7075
+(define set-read-config-state-accum-str!7076
   (|#%name|
    set-read-config-state-accum-str!
    (record-mutator struct:read-config-state 0)))
@@ -62877,11 +62881,11 @@
   (|#%name|
    set-read-config-state-accum-str!
    (lambda (s v)
-     (if (read-config-state?7071 s)
-       (set-read-config-state-accum-str!7075 s v)
+     (if (read-config-state?7072 s)
+       (set-read-config-state-accum-str!7076 s v)
        ($value
         (impersonate-set!
-         set-read-config-state-accum-str!7075
+         set-read-config-state-accum-str!7076
          struct:read-config-state
          0
          0
@@ -62889,7 +62893,7 @@
          v
          'read-config-state
          'accum-str))))))
-(define set-read-config-state-graph!7076
+(define set-read-config-state-graph!7077
   (|#%name|
    set-read-config-state-graph!
    (record-mutator struct:read-config-state 1)))
@@ -62897,11 +62901,11 @@
   (|#%name|
    set-read-config-state-graph!
    (lambda (s v)
-     (if (read-config-state?7071 s)
-       (set-read-config-state-graph!7076 s v)
+     (if (read-config-state?7072 s)
+       (set-read-config-state-graph!7077 s v)
        ($value
         (impersonate-set!
-         set-read-config-state-graph!7076
+         set-read-config-state-graph!7077
          struct:read-config-state
          1
          1
@@ -62909,7 +62913,7 @@
          v
          'read-config-state
          'graph))))))
-(define effect7077
+(define effect7078
   (begin
     (register-struct-constructor! read-config-state3.1)
     (register-struct-predicate! read-config-state?)
@@ -63458,7 +63462,7 @@
           (check-parameter 1/read-accept-lang config_0))))))
 (define struct:special-comment
   (make-record-type-descriptor* 'special-comment #f #f #f #f 1 1))
-(define effect7207
+(define effect7208
   (struct-type-install-properties!
    struct:special-comment
    'special-comment
@@ -63480,7 +63484,7 @@
   (|#%name| special-comment? (record-predicate struct:special-comment)))
 (define 1/special-comment-value
   (|#%name| special-comment-value (record-accessor struct:special-comment 0)))
-(define effect7208
+(define effect7209
   (begin
     (register-struct-constructor! 1/make-special-comment)
     (register-struct-predicate! 1/special-comment?)
@@ -63491,7 +63495,7 @@
     (void)))
 (define struct:readtable
   (make-record-type-descriptor* 'readtable #f #f #f #f 4 15))
-(define effect7209
+(define effect7210
   (struct-type-install-properties!
    struct:readtable
    'readtable
@@ -63518,7 +63522,7 @@
   (|#%name| readtable-dispatch-ht (record-accessor struct:readtable 2)))
 (define readtable-delimiter-ht
   (|#%name| readtable-delimiter-ht (record-accessor struct:readtable 3)))
-(define effect7210
+(define effect7211
   (begin
     (register-struct-constructor! readtable1.1)
     (register-struct-predicate! 1/readtable?)
@@ -63873,7 +63877,7 @@
                       fold-var_0))))))
              (for-loop_0 null (hash-iterate-first ht_0))))))))))
 (define struct:special (make-record-type-descriptor* 'special #f #f #f #f 1 1))
-(define effect7252
+(define effect7253
   (struct-type-install-properties!
    struct:special
    'special
@@ -63891,32 +63895,32 @@
    special
    (record-constructor
     (make-record-constructor-descriptor struct:special #f #f))))
-(define special?7251 (|#%name| special? (record-predicate struct:special)))
+(define special?7252 (|#%name| special? (record-predicate struct:special)))
 (define special?
   (|#%name|
    special?
    (lambda (v)
-     (if (special?7251 v)
+     (if (special?7252 v)
        #t
        ($value
-        (if (impersonator? v) (special?7251 (impersonator-val v)) #f))))))
-(define special-value7253
+        (if (impersonator? v) (special?7252 (impersonator-val v)) #f))))))
+(define special-value7254
   (|#%name| special-value (record-accessor struct:special 0)))
 (define special-value
   (|#%name|
    special-value
    (lambda (s)
-     (if (special?7251 s)
-       (special-value7253 s)
+     (if (special?7252 s)
+       (special-value7254 s)
        ($value
         (impersonate-ref
-         special-value7253
+         special-value7254
          struct:special
          0
          s
          'special
          'value))))))
-(define effect7254
+(define effect7255
   (begin
     (register-struct-constructor! special1.1)
     (register-struct-predicate! special?)
@@ -64403,7 +64407,7 @@
               p_0)))))))
 (define struct:accum-string
   (make-record-type-descriptor* 'accum-string #f #f #f #f 2 3))
-(define effect7324
+(define effect7325
   (struct-type-install-properties!
    struct:accum-string
    'accum-string
@@ -64431,7 +64435,7 @@
   (|#%name| set-accum-string-pos! (record-mutator struct:accum-string 0)))
 (define set-accum-string-str!
   (|#%name| set-accum-string-str! (record-mutator struct:accum-string 1)))
-(define effect7325
+(define effect7326
   (begin
     (register-struct-constructor! accum-string1.1)
     (register-struct-predicate! accum-string?)
@@ -64529,7 +64533,7 @@
      a_0)))
 (define struct:indentation
   (make-record-type-descriptor* 'indentation #f #f #f #f 8 255))
-(define effect7358
+(define effect7359
   (struct-type-install-properties!
    struct:indentation
    'indentation
@@ -64547,33 +64551,33 @@
    indentation
    (record-constructor
     (make-record-constructor-descriptor struct:indentation #f #f))))
-(define indentation?7357
+(define indentation?7358
   (|#%name| indentation? (record-predicate struct:indentation)))
 (define indentation?
   (|#%name|
    indentation?
    (lambda (v)
-     (if (indentation?7357 v)
+     (if (indentation?7358 v)
        #t
        ($value
-        (if (impersonator? v) (indentation?7357 (impersonator-val v)) #f))))))
-(define indentation-closer7359
+        (if (impersonator? v) (indentation?7358 (impersonator-val v)) #f))))))
+(define indentation-closer7360
   (|#%name| indentation-closer (record-accessor struct:indentation 0)))
 (define indentation-closer
   (|#%name|
    indentation-closer
    (lambda (s)
-     (if (indentation?7357 s)
-       (indentation-closer7359 s)
+     (if (indentation?7358 s)
+       (indentation-closer7360 s)
        ($value
         (impersonate-ref
-         indentation-closer7359
+         indentation-closer7360
          struct:indentation
          0
          s
          'indentation
          'closer))))))
-(define indentation-suspicious-closer7360
+(define indentation-suspicious-closer7361
   (|#%name|
    indentation-suspicious-closer
    (record-accessor struct:indentation 1)))
@@ -64581,65 +64585,65 @@
   (|#%name|
    indentation-suspicious-closer
    (lambda (s)
-     (if (indentation?7357 s)
-       (indentation-suspicious-closer7360 s)
+     (if (indentation?7358 s)
+       (indentation-suspicious-closer7361 s)
        ($value
         (impersonate-ref
-         indentation-suspicious-closer7360
+         indentation-suspicious-closer7361
          struct:indentation
          1
          s
          'indentation
          'suspicious-closer))))))
-(define indentation-multiline?7361
+(define indentation-multiline?7362
   (|#%name| indentation-multiline? (record-accessor struct:indentation 2)))
 (define indentation-multiline?
   (|#%name|
    indentation-multiline?
    (lambda (s)
-     (if (indentation?7357 s)
-       (indentation-multiline?7361 s)
+     (if (indentation?7358 s)
+       (indentation-multiline?7362 s)
        ($value
         (impersonate-ref
-         indentation-multiline?7361
+         indentation-multiline?7362
          struct:indentation
          2
          s
          'indentation
          'multiline?))))))
-(define indentation-start-line7362
+(define indentation-start-line7363
   (|#%name| indentation-start-line (record-accessor struct:indentation 3)))
 (define indentation-start-line
   (|#%name|
    indentation-start-line
    (lambda (s)
-     (if (indentation?7357 s)
-       (indentation-start-line7362 s)
+     (if (indentation?7358 s)
+       (indentation-start-line7363 s)
        ($value
         (impersonate-ref
-         indentation-start-line7362
+         indentation-start-line7363
          struct:indentation
          3
          s
          'indentation
          'start-line))))))
-(define indentation-last-line7363
+(define indentation-last-line7364
   (|#%name| indentation-last-line (record-accessor struct:indentation 4)))
 (define indentation-last-line
   (|#%name|
    indentation-last-line
    (lambda (s)
-     (if (indentation?7357 s)
-       (indentation-last-line7363 s)
+     (if (indentation?7358 s)
+       (indentation-last-line7364 s)
        ($value
         (impersonate-ref
-         indentation-last-line7363
+         indentation-last-line7364
          struct:indentation
          4
          s
          'indentation
          'last-line))))))
-(define indentation-suspicious-line7364
+(define indentation-suspicious-line7365
   (|#%name|
    indentation-suspicious-line
    (record-accessor struct:indentation 5)))
@@ -64647,33 +64651,33 @@
   (|#%name|
    indentation-suspicious-line
    (lambda (s)
-     (if (indentation?7357 s)
-       (indentation-suspicious-line7364 s)
+     (if (indentation?7358 s)
+       (indentation-suspicious-line7365 s)
        ($value
         (impersonate-ref
-         indentation-suspicious-line7364
+         indentation-suspicious-line7365
          struct:indentation
          5
          s
          'indentation
          'suspicious-line))))))
-(define indentation-max-indent7365
+(define indentation-max-indent7366
   (|#%name| indentation-max-indent (record-accessor struct:indentation 6)))
 (define indentation-max-indent
   (|#%name|
    indentation-max-indent
    (lambda (s)
-     (if (indentation?7357 s)
-       (indentation-max-indent7365 s)
+     (if (indentation?7358 s)
+       (indentation-max-indent7366 s)
        ($value
         (impersonate-ref
-         indentation-max-indent7365
+         indentation-max-indent7366
          struct:indentation
          6
          s
          'indentation
          'max-indent))))))
-(define indentation-suspicious-quote7366
+(define indentation-suspicious-quote7367
   (|#%name|
    indentation-suspicious-quote
    (record-accessor struct:indentation 7)))
@@ -64681,17 +64685,17 @@
   (|#%name|
    indentation-suspicious-quote
    (lambda (s)
-     (if (indentation?7357 s)
-       (indentation-suspicious-quote7366 s)
+     (if (indentation?7358 s)
+       (indentation-suspicious-quote7367 s)
        ($value
         (impersonate-ref
-         indentation-suspicious-quote7366
+         indentation-suspicious-quote7367
          struct:indentation
          7
          s
          'indentation
          'suspicious-quote))))))
-(define set-indentation-suspicious-closer!7367
+(define set-indentation-suspicious-closer!7368
   (|#%name|
    set-indentation-suspicious-closer!
    (record-mutator struct:indentation 1)))
@@ -64699,11 +64703,11 @@
   (|#%name|
    set-indentation-suspicious-closer!
    (lambda (s v)
-     (if (indentation?7357 s)
-       (set-indentation-suspicious-closer!7367 s v)
+     (if (indentation?7358 s)
+       (set-indentation-suspicious-closer!7368 s v)
        ($value
         (impersonate-set!
-         set-indentation-suspicious-closer!7367
+         set-indentation-suspicious-closer!7368
          struct:indentation
          1
          1
@@ -64711,17 +64715,17 @@
          v
          'indentation
          'suspicious-closer))))))
-(define set-indentation-multiline?!7368
+(define set-indentation-multiline?!7369
   (|#%name| set-indentation-multiline?! (record-mutator struct:indentation 2)))
 (define set-indentation-multiline?!
   (|#%name|
    set-indentation-multiline?!
    (lambda (s v)
-     (if (indentation?7357 s)
-       (set-indentation-multiline?!7368 s v)
+     (if (indentation?7358 s)
+       (set-indentation-multiline?!7369 s v)
        ($value
         (impersonate-set!
-         set-indentation-multiline?!7368
+         set-indentation-multiline?!7369
          struct:indentation
          2
          2
@@ -64729,17 +64733,17 @@
          v
          'indentation
          'multiline?))))))
-(define set-indentation-last-line!7369
+(define set-indentation-last-line!7370
   (|#%name| set-indentation-last-line! (record-mutator struct:indentation 4)))
 (define set-indentation-last-line!
   (|#%name|
    set-indentation-last-line!
    (lambda (s v)
-     (if (indentation?7357 s)
-       (set-indentation-last-line!7369 s v)
+     (if (indentation?7358 s)
+       (set-indentation-last-line!7370 s v)
        ($value
         (impersonate-set!
-         set-indentation-last-line!7369
+         set-indentation-last-line!7370
          struct:indentation
          4
          4
@@ -64747,7 +64751,7 @@
          v
          'indentation
          'last-line))))))
-(define set-indentation-suspicious-line!7370
+(define set-indentation-suspicious-line!7371
   (|#%name|
    set-indentation-suspicious-line!
    (record-mutator struct:indentation 5)))
@@ -64755,11 +64759,11 @@
   (|#%name|
    set-indentation-suspicious-line!
    (lambda (s v)
-     (if (indentation?7357 s)
-       (set-indentation-suspicious-line!7370 s v)
+     (if (indentation?7358 s)
+       (set-indentation-suspicious-line!7371 s v)
        ($value
         (impersonate-set!
-         set-indentation-suspicious-line!7370
+         set-indentation-suspicious-line!7371
          struct:indentation
          5
          5
@@ -64767,17 +64771,17 @@
          v
          'indentation
          'suspicious-line))))))
-(define set-indentation-max-indent!7371
+(define set-indentation-max-indent!7372
   (|#%name| set-indentation-max-indent! (record-mutator struct:indentation 6)))
 (define set-indentation-max-indent!
   (|#%name|
    set-indentation-max-indent!
    (lambda (s v)
-     (if (indentation?7357 s)
-       (set-indentation-max-indent!7371 s v)
+     (if (indentation?7358 s)
+       (set-indentation-max-indent!7372 s v)
        ($value
         (impersonate-set!
-         set-indentation-max-indent!7371
+         set-indentation-max-indent!7372
          struct:indentation
          6
          6
@@ -64785,7 +64789,7 @@
          v
          'indentation
          'max-indent))))))
-(define set-indentation-suspicious-quote!7372
+(define set-indentation-suspicious-quote!7373
   (|#%name|
    set-indentation-suspicious-quote!
    (record-mutator struct:indentation 7)))
@@ -64793,11 +64797,11 @@
   (|#%name|
    set-indentation-suspicious-quote!
    (lambda (s v)
-     (if (indentation?7357 s)
-       (set-indentation-suspicious-quote!7372 s v)
+     (if (indentation?7358 s)
+       (set-indentation-suspicious-quote!7373 s v)
        ($value
         (impersonate-set!
-         set-indentation-suspicious-quote!7372
+         set-indentation-suspicious-quote!7373
          struct:indentation
          7
          7
@@ -64805,7 +64809,7 @@
          v
          'indentation
          'suspicious-quote))))))
-(define effect7373
+(define effect7374
   (begin
     (register-struct-constructor! indentation1.1)
     (register-struct-predicate! indentation?)
@@ -65666,7 +65670,7 @@
        single-mode_0))))
 (define struct:parse-state
   (make-record-type-descriptor* 'parse-state #f #f #f #f 5 31))
-(define effect7451
+(define effect7452
   (struct-type-install-properties!
    struct:parse-state
    'parse-state
@@ -65698,7 +65702,7 @@
   (|#%name|
    parse-state-other-exactness
    (record-accessor struct:parse-state 4)))
-(define effect7452
+(define effect7453
   (begin
     (register-struct-constructor! parse-state6.1)
     (register-struct-predicate! parse-state?)
@@ -65722,7 +65726,7 @@
     (void)))
 (define struct:rect-prefix
   (make-record-type-descriptor* 'rect-prefix #f #f #f #f 3 7))
-(define effect7453
+(define effect7454
   (struct-type-install-properties!
    struct:rect-prefix
    'rect-prefix
@@ -65748,7 +65752,7 @@
   (|#%name| rect-prefix-n (record-accessor struct:rect-prefix 1)))
 (define rect-prefix-start
   (|#%name| rect-prefix-start (record-accessor struct:rect-prefix 2)))
-(define effect7454
+(define effect7455
   (begin
     (register-struct-constructor! rect-prefix7.1)
     (register-struct-predicate! rect-prefix?)
@@ -65758,7 +65762,7 @@
     (void)))
 (define struct:polar-prefix
   (make-record-type-descriptor* 'polar-prefix #f #f #f #f 3 7))
-(define effect7455
+(define effect7456
   (struct-type-install-properties!
    struct:polar-prefix
    'polar-prefix
@@ -65784,7 +65788,7 @@
   (|#%name| polar-prefix-n (record-accessor struct:polar-prefix 1)))
 (define polar-prefix-start
   (|#%name| polar-prefix-start (record-accessor struct:polar-prefix 2)))
-(define effect7456
+(define effect7457
   (begin
     (register-struct-constructor! polar-prefix8.1)
     (register-struct-predicate! polar-prefix?)
@@ -65882,7 +65886,7 @@
       #f)))
 (define struct:lazy-expt
   (make-record-type-descriptor* 'lazy-expt #f #f #f #f 3 7))
-(define effect7473
+(define effect7474
   (struct-type-install-properties!
    struct:lazy-expt
    'lazy-expt
@@ -65907,7 +65911,7 @@
   (|#%name| lazy-expt-radix (record-accessor struct:lazy-expt 1)))
 (define lazy-expt-exp
   (|#%name| lazy-expt-exp (record-accessor struct:lazy-expt 2)))
-(define effect7474
+(define effect7475
   (begin
     (register-struct-constructor! lazy-expt9.1)
     (register-struct-predicate! lazy-expt?)
@@ -65917,7 +65921,7 @@
     (void)))
 (define struct:lazy-rational
   (make-record-type-descriptor* 'lazy-rational #f #f #f #f 2 3))
-(define effect7475
+(define effect7476
   (struct-type-install-properties!
    struct:lazy-rational
    'lazy-rational
@@ -65941,7 +65945,7 @@
   (|#%name| lazy-rational-n (record-accessor struct:lazy-rational 0)))
 (define lazy-rational-d
   (|#%name| lazy-rational-d (record-accessor struct:lazy-rational 1)))
-(define effect7476
+(define effect7477
   (begin
     (register-struct-constructor! lazy-rational10.1)
     (register-struct-predicate! lazy-rational?)
@@ -75237,7 +75241,7 @@
    'variable-reference->module-declaration-inspector
    'read-syntax
    'read-syntax/recursive))
-(define effect8297
+(define effect8298
   (begin
     (void
      (begin
@@ -80746,7 +80750,7 @@
                                   formals_0)
                                  sc-formals_0)
                                exp-body_0))))))))))))))))
-(define effect8963
+(define effect8964
   (begin
     (void
      (add-core-form!*
@@ -80834,7 +80838,7 @@
                    (args (raise-binding-result-arity-error 2 args))))))
               (args (raise-binding-result-arity-error 4 args)))))))))
     (void)))
-(define effect8964
+(define effect8965
   (begin
     (void
      (add-core-form!*
@@ -80916,7 +80920,7 @@
                     s_0))))))
           (args (raise-binding-result-arity-error 4 args)))))))
     (void)))
-(define effect8965
+(define effect8966
   (begin
     (void
      (add-core-form!*
@@ -83620,28 +83624,28 @@
                                                                                   trans-idss_0)))))))))))))))))))))))))))))))))
                   (args (raise-binding-result-arity-error 5 args)))))
                (args (raise-binding-result-arity-error 7 args)))))))))))
-(define effect9194
+(define effect9195
   (begin
     (void
      (add-core-form!*
       'let-values
       (make-let-values-form.1 'prim-let-values #f #f #f)))
     (void)))
-(define effect9195
+(define effect9196
   (begin
     (void
      (add-core-form!*
       'letrec-values
       (make-let-values-form.1 'prim-letrec-values #t #f #f)))
     (void)))
-(define effect9196
+(define effect9197
   (begin
     (void
      (add-core-form!*
       'letrec-syntaxes+values
       (make-let-values-form.1 'prim-letrec-syntaxes+values #t #t #t)))
     (void)))
-(define effect9197
+(define effect9198
   (begin
     (void
      (add-core-form!*
@@ -83712,7 +83716,7 @@
                        (rebuild.1 #t rebuild-s_0 temp222_0))))))
               (args (raise-binding-result-arity-error 3 args)))))))))
     (void)))
-(define effect9198
+(define effect9199
   (begin
     (void
      (add-core-form!*
@@ -83773,7 +83777,7 @@
                        (rebuild.1 #t s_0 temp228_0))))))
               (args (raise-binding-result-arity-error 3 args)))))))))
     (void)))
-(define effect9199
+(define effect9200
   (begin
     (void
      (add-core-form!*
@@ -83930,7 +83934,7 @@
                                             temp246_0))))))))))))))))
               (args (raise-binding-result-arity-error 3 args)))))))))
     (void)))
-(define effect9200
+(define effect9201
   (begin
     (void
      (add-core-form!*
@@ -83998,7 +84002,7 @@
                s_0))
             (args (raise-binding-result-arity-error 3 args))))))))
     (void)))
-(define effect9201
+(define effect9202
   (begin
     (void
      (add-core-form!*
@@ -84303,7 +84307,7 @@
                  (args (raise-binding-result-arity-error 3 args)))))
               (args (raise-binding-result-arity-error 3 args)))))))))
     (void)))
-(define effect9202
+(define effect9203
   (begin
     (void
      (add-core-form!*
@@ -84567,7 +84571,7 @@
                    (args (raise-binding-result-arity-error 5 args))))))
               (args (raise-binding-result-arity-error 4 args)))))))))
     (void)))
-(define effect9203
+(define effect9204
   (begin
     (void
      (add-core-form!*
@@ -84834,7 +84838,7 @@
                           (let ((temp349_0 (cons begin338_0 exp-es_0)))
                             (rebuild.1 #t rebuild-s_0 temp349_0)))))))
                  (args (raise-binding-result-arity-error 3 args))))))))))))
-(define effect9223
+(define effect9224
   (begin
     (void
      (add-core-form!*
@@ -84891,7 +84895,7 @@
                   (args (raise-binding-result-arity-error 2 args)))))
               (|#%app| nonempty-begin_0 s_0 ctx_0)))))))
     (void)))
-(define effect9224
+(define effect9225
   (begin
     (void
      (add-core-form!*
@@ -84922,7 +84926,7 @@
                  null)))))
         #t)
       #f)))
-(define effect9286
+(define effect9287
   (begin
     (void
      (add-core-form!*
@@ -85152,7 +85156,7 @@
             ctx_0
             implicit-omitted?358_0)))))))
     (void)))
-(define effect9287
+(define effect9288
   (begin
     (void
      (add-core-form!*
@@ -85473,7 +85477,7 @@
         disarmed-s_0)
        s_0)
       s_0)))
-(define effect9335
+(define effect9336
   (begin
     (void
      (add-core-form!*
@@ -85810,7 +85814,7 @@
                  (args (raise-binding-result-arity-error 4 args)))))
               (args (raise-binding-result-arity-error 3 args)))))))))
     (void)))
-(define effect9336
+(define effect9337
   (begin
     (void
      (add-core-form!*
@@ -85911,14 +85915,14 @@
                            result-s_0)))))))
               (args (raise-binding-result-arity-error 3 args)))))))))
     (void)))
-(define effect9337
+(define effect9338
   (begin
     (void
      (add-core-form!*
       'unquote
       (lambda (s_0 ctx_0) (raise-syntax-error$1 #f "not in quasiquote" s_0))))
     (void)))
-(define effect9338
+(define effect9339
   (begin
     (void
      (add-core-form!*
@@ -89130,7 +89134,7 @@
      (if (parsed? body_0)
        (datum->syntax$1 #f body_0 (parsed-s body_0))
        body_0))))
-(define effect9865
+(define effect9866
   (begin
     (void
      (add-core-form!*
@@ -89162,7 +89166,7 @@
              #f)
             (if log-performance? (end-performance-region) (void)))))))
     (void)))
-(define effect9866
+(define effect9867
   (begin
     (void
      (add-core-form!*
@@ -89178,7 +89182,7 @@
            "illegal use (not in a module top-level)"
            s_0)))))
     (void)))
-(define effect9867
+(define effect9868
   (begin
     (void
      (add-core-form!*
@@ -89379,7 +89383,7 @@
                 "expand-context/outer?"
                 ctx_0))))))))
     (void)))
-(define effect9868
+(define effect9869
   (begin
     (void
      (add-core-form!*
@@ -96261,7 +96265,7 @@
             (values
              tl-ids_0
              (select-defined-syms-and-bind!/ctx tmp-bind-ids_0 ctx_0))))))))
-(define effect10463
+(define effect10464
   (begin
     (void
      (add-core-form!*
@@ -96435,7 +96439,7 @@
                    (args (raise-binding-result-arity-error 2 args)))))
                 (args (raise-binding-result-arity-error 4 args))))))))))
     (void)))
-(define effect10464
+(define effect10465
   (begin
     (void
      (add-core-form!*
@@ -96626,7 +96630,7 @@
                    (args (raise-binding-result-arity-error 2 args)))))
                 (args (raise-binding-result-arity-error 4 args))))))))))
     (void)))
-(define effect10465
+(define effect10466
   (begin
     (void
      (add-core-form!*
@@ -96987,7 +96991,7 @@
                                (rebuild.1 #t s_0 temp46_0)))))))))
                 (args (raise-binding-result-arity-error 3 args))))))))))
     (void)))
-(define effect10466
+(define effect10467
   (begin
     (void
      (add-core-form!*
@@ -97101,7 +97105,7 @@
                          s_0)))))
                 (args (raise-binding-result-arity-error 3 args))))))))))
     (void)))
-(define effect10467
+(define effect10468
   (begin
     (void
      (add-core-form!*
@@ -97314,7 +97318,7 @@
            (declare-reexporting-module!.1 ns_0 #f '|#%builtin| temp39_0))
          (1/current-namespace ns_0)
          (1/dynamic-require ''|#%kernel| 0))))))
-(define effect10468
+(define effect10469
   (begin
     (|#%call-with-values| (lambda () (namespace-init!)) print-values)
     (void)))
diff --git a/racket/src/expander/eval/module-cache.rkt b/racket/src/expander/eval/module-cache.rkt
index 1e600c2008..97608614a6 100644
--- a/racket/src/expander/eval/module-cache.rkt
+++ b/racket/src/expander/eval/module-cache.rkt
@@ -28,7 +28,8 @@
   (and hash-code
        ;; Encode as a symbol so we can use an eq?-based hash table
        ;; (i.e., explot the low-level lock on the symbol table)
-       (string->symbol (format "~s" (list hash-code (current-load-relative-directory))))))
+       (string->symbol (format "~s" (list hash-code (path->directory-path
+                                                     (current-load-relative-directory)))))))
 
 (define (module-cache-set! key proc)
   (hash-set! module-cache key (make-ephemeron key proc)))