(eval-and-compile): Preserve the surrounding lexical context

Implement a better fix for bug#79634.

* lisp/emacs-lisp/byte-run.el (eval-and-compile):
* lisp/emacs-lisp/bytecomp.el (byte-compile-initial-macro-environment)
<eval-and-compile>: Preserve the surrounding lexical context (the part
available during macroexpansion, i.e. which vars are dynbound).

* lisp/emacs-lisp/rx.el (<pcase> rx): Remove workaround.

* test/lisp/emacs-lisp/macroexp-tests.el
(macroexp--dynbound-eval-and-compile): New test.

1 files changed, 42 insertions, 0 deletions

diff --git a/test/lisp/emacs-lisp/macroexp-tests.el b/test/lisp/emacs-lisp/macroexp-tests.el
index 817c5d7be49..91d66986bc6 100644
--- a/test/lisp/emacs-lisp/macroexp-tests.el
+++ b/test/lisp/emacs-lisp/macroexp-tests.el
@@ -124,6 +124,48 @@
                      (dyn dyn dyn dyn)
                      (dyn dyn dyn lex))))))
 
+(ert-deftest macroexp--dynbound-eval-and-compile ()
+  (let ((code1 '(progn
+                  (eval-and-compile
+                    (defun my-foo () (bound-and-true-p my-foo))
+                    (defun my-identity (x)
+                      (defvar my-foo)
+                      (let ((my-foo x))
+                        (my-foo))))
+                  (defmacro my-toto (y)
+                    `(list ',y ',(my-identity y)))
+                  (eval-when-compile (my-toto 7))))
+        (code2 '(progn
+                  (defvar my-foo)
+                  (eval-and-compile
+                    (defun my-foo () (bound-and-true-p my-foo))
+                    (defun my-identity (x)
+                      (let ((my-foo x))
+                        (my-foo))))
+                  (defmacro my-toto (y)
+                    `(list ',y ',(my-identity y)))
+                  (eval-when-compile (my-toto 7))))
+        (code3 '(progn
+                  (eval-and-compile
+                    (defvar my-foo)
+                    (defun my-foo () (bound-and-true-p my-foo))
+                    (defun my-identity (x)
+                      (let ((my-foo x))
+                        (my-foo))))
+                  (defmacro my-toto (y)
+                    `(list ',y ',(my-identity y)))
+                  (eval-when-compile (my-toto 7)))))
+    (should (equal (eval code1 t) '(7 7)))
+    (should (equal (eval code2 t) '(7 7)))
+    (should (equal (eval code3 t) '(7 7)))
+    (should (equal (eval (let ((lexical-binding t)) (byte-compile code1)) t)
+                   '(7 7)))
+    (should (equal (eval (let ((lexical-binding t)) (byte-compile code2)) t)
+                   '(7 7)))
+    (should (equal (eval (let ((lexical-binding t)) (byte-compile code3)) t)
+                   '(7 7)))
+    ))
+
 (defmacro macroexp--test-macro1 ()
   (declare (obsolete "new-replacement" nil))
   1)