Skip to content

Don't use macros inside logmsg_code #250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 21, 2025
Merged

Don't use macros inside logmsg_code #250

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions base/logging/logging.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,11 +347,13 @@ end
# Generate code for logging macros
function logmsg_code(_module, file, line, level, message, exs...)
@nospecialize
msg = gensym(:msg)
kwargs = gensym(:kwargs)
log_data = process_logmsg_exs(_module, file, line, level, message, exs...)
if !isa(message, Symbol) && issimple(message) && isempty(log_data.kwargs)
logrecord = quote
msg = $(message)
kwargs = (;)
$(msg) = $(message)
$(kwargs) = (;)
true
end
elseif issimple(message) && all(issimplekw, log_data.kwargs)
Expand All @@ -370,8 +372,8 @@ function logmsg_code(_module, file, line, level, message, exs...)
logrecord = quote
let err = $checkerrors
if err === nothing
msg = $(message)
kwargs = (;$(log_data.kwargs...))
$(msg) = $(message)
$(kwargs) = (;$(log_data.kwargs...))
true
else
@invokelatest $(logging_error)(logger, level, _module, group, id, file, line, err, false)
Expand All @@ -382,8 +384,8 @@ function logmsg_code(_module, file, line, level, message, exs...)
else
logrecord = quote
try
msg = $(esc(message))
kwargs = (;$(log_data.kwargs...))
$(msg) = $(esc(message))
$(kwargs) = (;$(log_data.kwargs...))
true
catch err
@invokelatest $(logging_error)(logger, level, _module, group, id, file, line, err, true)
Expand All @@ -410,13 +412,13 @@ function logmsg_code(_module, file, line, level, message, exs...)
file = Base.fixup_stdlib_path(file)
end
line = $(log_data._line)
local msg, kwargs
local $(msg), $(kwargs)
if $(logrecord)
@assert @isdefined(msg) "Assertion to tell the compiler about the definedness of this variable"
@assert @isdefined(kwargs) "Assertion to tell the compiler about the definedness of this variable"
$(Expr(:isdefined, msg)) || throw(AssertionError("Assertion to tell the compiler about the definedness of this variable"))
$(Expr(:isdefined, kwargs)) || throw(AssertionError("Assertion to tell the compiler about the definedness of this variable"))
$handle_message_nothrow(
logger, level, msg, _module, group, id, file, line;
kwargs...)
logger, level, $(msg), _module, group, id, file, line;
$(kwargs)...)
end
end
end
Expand Down