From e8567dbd21ae60ef93d84a24884bbad295db01b3 Mon Sep 17 00:00:00 2001
From: Chris Foster <chris42f@gmail.com>
Date: Sun, 3 May 2020 00:44:30 +1000
Subject: [PATCH] More flexibility in freezing parser world age

This separates the decision about whether to freeze the parser world age
from Core.Compiler.parse. The builtin _apply_in_world allows this to be
done with more flexibility from outside (for example, one might want to
do some argument conversion in the current world before calling through
to a fixed world for the parser internals.
---
 base/compiler/parsing.jl | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/base/compiler/parsing.jl b/base/compiler/parsing.jl
index f9d5171684eda..e6d831b38d4f5 100644
--- a/base/compiler/parsing.jl
+++ b/base/compiler/parsing.jl
@@ -15,29 +15,33 @@ function fl_parse(text::Union{Core.SimpleVector,String},
 end
 
 function fl_parse(text::AbstractString, filename::AbstractString, offset, options)
-    # By default fl_parse is frozen in an early world, where conversion from
-    # String doesn't necessarily work. Use invokelatest to allow users to be
-    # able to pass AbstractString.
-    fl_parse(invokelatest(String, text), invokelatest(String, filename),
-             offset, options)
+    fl_parse(String(text), String(filename), offset, options)
 end
 
-_current_parser = nothing
-
 """
     set_parser(func)
 
 Swap the parser used for all juila code to the given `func`.
 
+When installing a parser, it may be appropriate to freeze it to a given world
+age:
+
+```
+let world = unsafe_load(cglobal(:jl_world_counter, Csize_t))
+    function your_parser_entry_point(text, filename, offset, options)
+        Core._apply_in_world(\$world, your_parser, (text, filename, offset, options))
+    end
+end
+```
+
 !!! note
     Experimental! May be removed at any time.
 """
 function set_parser(func)
-    world = unsafe_load(cglobal(:jl_world_counter, Csize_t))
-    global _current_parser = (func,world)
+    global _parser = func
 end
 
-set_parser(fl_parse)
+_parser = fl_parse
 
 """
     parse(text, filename, offset, options)
@@ -55,8 +59,5 @@ as it's defined.
     Experimental! May be removed at any time.
 """
 function parse(text, filename, offset, options)
-    # In future it might be nice to wrap up this (parser,world) and
-    # _apply_in_world pattern into a FrozenWorld type which inference knows about.
-    parser,world = _current_parser
-    Core._apply_in_world(world, parser, (text, filename, offset, options))
+    _parser(text, filename, offset, options)
 end