Skip to content

Commit ea37e26

Browse files
committed
remove use of use-interpreter-for-eval
No longer does anything.
1 parent 5fb5af1 commit ea37e26

File tree

7 files changed

+20
-28
lines changed

7 files changed

+20
-28
lines changed

src/core/corePackage.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@ SYMBOL_EXPORT_SC_(CorePkg, STARserializerArchiveSTAR);
185185
SYMBOL_EXPORT_SC_(CorePkg, STARterminate_hooksSTAR);
186186
SYMBOL_EXPORT_SC_(CorePkg, STARtopLevelCommandHookSTAR);
187187
SYMBOL_EXPORT_SC_(CorePkg, STARuseBuildForkRedirectSTAR);
188-
SYMBOL_EXPORT_SC_(CorePkg, STARuseInterpreterForEvalSTAR);
189188
SYMBOL_EXPORT_SC_(CorePkg, STARuseParallelBuildSTAR);
190189
SYMBOL_EXPORT_SC_(CorePkg, _BANG_unbound_BANG_);
191190
SYMBOL_EXPORT_SC_(CorePkg, _PLUS_WNOHANG_PLUS_);
@@ -589,7 +588,6 @@ void CoreExposer_O::define_essential_globals(LispPtr lisp) {
589588
_sym_STARdebugEvalSTAR->defparameter(nil<T_O>());
590589
_sym_STARdebugStartupSTAR->defparameter(nil<T_O>());
591590
_sym_STARdebugInterpretedFunctionsSTAR->defparameter(nil<T_O>());
592-
_sym_STARuseInterpreterForEvalSTAR->defparameter(nil<T_O>()); // _lisp->_true());
593591
_sym_STARcxxDocumentationSTAR->defparameter(nil<T_O>());
594592
_sym__PLUS_class_name_to_lisp_name_PLUS_->defparameter(nil<T_O>());
595593
_sym__PLUS_type_header_value_map_PLUS_->defparameter(nil<T_O>());

src/core/lisp.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2227,7 +2227,6 @@ bool Lisp::load(int& exitCode) {
22272227
startup_functions_invoke(NULL);
22282228
} else {
22292229
Pathname_sp initPathname = gc::As<Pathname_sp>(_sym_STARcommandLineImageSTAR->symbolValue());
2230-
DynamicScopeManager scope(_sym_STARuseInterpreterForEvalSTAR, _lisp->_true());
22312230
if (!global_options->_SilentStartup) {
22322231
printf("Loading image %s\n", _rep_(initPathname).c_str());
22332232
}

src/lisp/kernel/clos/combin.lisp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@
3535

3636
(defun emf-maybe-compile (form)
3737
(if (or *avoid-compiling* (not cmp:*cleavir-compile-hook*))
38-
(let ((core:*use-interpreter-for-eval* t))
39-
(coerce form 'function))
38+
(coerce form 'function)
4039
(let ((*avoid-compiling* t))
4140
(compile nil form))))
4241

src/lisp/kernel/clos/static-gfs/change-class.lisp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,7 @@
137137
(clos:set-funcallable-instance-function
138138
changer
139139
#+(or)
140-
(let ((core:*use-interpreter-for-eval* t)
141-
(cmp:*cleavir-compile-hook* nil))
140+
(let ((cmp:*cleavir-compile-hook* nil))
142141
(coerce (generate-class-changer-function changer) 'function))
143142
;;#+(or)
144143
(error "BUG: No suitable compiler yet")))

src/lisp/kernel/clos/static-gfs/compute-constructor.lisp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
(clos:finalize-inheritance class))
1616
;; bclasp-compile because cclasp is full of make-instance
1717
;;#+(or)
18-
(let ((core:*use-interpreter-for-eval* t)
19-
(cmp:*cleavir-compile-hook* nil))
18+
(let ((cmp:*cleavir-compile-hook* nil))
2019
(coerce (constructor-form class class-form keys) 'function))
2120
#+(or)
2221
(cmp:bclasp-compile nil (constructor-form class class-form keys)))))

src/lisp/kernel/clos/static-gfs/reinitialize-instance.lisp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,7 @@
9898
(clos:set-funcallable-instance-function
9999
reinitializer
100100
#+(or)
101-
(let ((core:*use-interpreter-for-eval* t)
102-
(cmp:*cleavir-compile-hook* nil))
101+
(let ((cmp:*cleavir-compile-hook* nil))
103102
(coerce (generate-reinitializer-function reinitializer) 'function))
104103
;;#+(or)
105104
(error "BUG: No suitable compiler yet")))

src/lisp/kernel/lsp/top-hook.lisp

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,21 @@
2929
(defun sys::standard-toplevel ()
3030
(ext:lock-package "CORE")
3131

32-
(let ((core:*use-interpreter-for-eval* nil))
33-
#-staging (when (ext:getenv "CLASP_AUTOCOMPILATION")
34-
(funcall 'ext:start-autocompilation))
35-
(case (core:startup-type)
36-
((:snapshot-file :embedded-snapshot)
37-
(sys::load-foreign-libraries))
38-
(otherwise
39-
(core:maybe-load-clasprc)
40-
(sys::load-extensions)))
41-
(sys::call-initialize-hooks)
42-
(unwind-protect
43-
(progn
44-
(core:process-command-line-load-eval-sequence)
45-
(if (core:is-interactive-lisp)
46-
(core:top-level)
47-
(core:exit 0)))
48-
(sys::call-terminate-hooks))))
32+
#-staging (when (ext:getenv "CLASP_AUTOCOMPILATION")
33+
(funcall 'ext:start-autocompilation))
34+
(case (core:startup-type)
35+
((:snapshot-file :embedded-snapshot)
36+
(sys::load-foreign-libraries))
37+
(otherwise
38+
(core:maybe-load-clasprc)
39+
(sys::load-extensions)))
40+
(sys::call-initialize-hooks)
41+
(unwind-protect
42+
(progn
43+
(core:process-command-line-load-eval-sequence)
44+
(if (core:is-interactive-lisp)
45+
(core:top-level)
46+
(core:exit 0)))
47+
(sys::call-terminate-hooks)))
4948

5049
(setf ext:*toplevel-hook* 'sys::standard-toplevel)

0 commit comments

Comments
 (0)