From 2259c79340a3b5f5bc7ba2407d965e81e40e6dfc Mon Sep 17 00:00:00 2001
From: Shuhei Kadowaki <40514306+aviatesk@users.noreply.github.com>
Date: Wed, 18 Sep 2024 00:41:52 +0900
Subject: [PATCH] use `inferencebarrier` instead of `invokelatest` for 1-arg
 `@assert` (#55783)

This version would be better as per this comment:
<https://github.com/JuliaLang/julia/pull/55739#pullrequestreview-2304360447>
I confirmed this still allows us to avoid invalidations reported at
JuliaLang/julia#55583.

(cherry picked from commit f8086062906d80ef56c0dcd595a13438ef028293)
---
 base/error.jl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/base/error.jl b/base/error.jl
index e25157b6f2b957..a318dc9768100d 100644
--- a/base/error.jl
+++ b/base/error.jl
@@ -223,14 +223,16 @@ macro assert(ex, msgs...)
         msg = msg # pass-through
     elseif !isempty(msgs) && (isa(msg, Expr) || isa(msg, Symbol))
         # message is an expression needing evaluating
-        msg = :(Main.Base.invokelatest(Main.Base.string, $(esc(msg))))
+        # N.B. To reduce the risk of invalidation caused by the complex callstack involved
+        # with `string`, use `inferencebarrier` here to hide this `string` from the compiler.
+        msg = :(Main.Base.inferencebarrier(Main.Base.string)($(esc(msg))))
     elseif isdefined(Main, :Base) && isdefined(Main.Base, :string) && applicable(Main.Base.string, msg)
         msg = Main.Base.string(msg)
     else
         # string() might not be defined during bootstrap
         msg = quote
             msg = $(Expr(:quote,msg))
-            isdefined(Main, :Base) ? Main.Base.invokelatest(Main.Base.string, msg) :
+            isdefined(Main, :Base) ? Main.Base.inferencebarrier(Main.Base.string, msg) :
                 (Core.println(msg); "Error during bootstrap. See stdout.")
         end
     end