@@ -347,11 +347,13 @@ end
347
347
# Generate code for logging macros
348
348
function logmsg_code (_module, file, line, level, message, exs... )
349
349
@nospecialize
350
+ msg = gensym (:msg )
351
+ kwargs = gensym (:kwargs )
350
352
log_data = process_logmsg_exs (_module, file, line, level, message, exs... )
351
353
if ! isa (message, Symbol) && issimple (message) && isempty (log_data. kwargs)
352
354
logrecord = quote
353
- msg = $ (message)
354
- kwargs = (;)
355
+ $ ( msg) = $ (message)
356
+ $ ( kwargs) = (;)
355
357
true
356
358
end
357
359
elseif issimple (message) && all (issimplekw, log_data. kwargs)
@@ -370,8 +372,8 @@ function logmsg_code(_module, file, line, level, message, exs...)
370
372
logrecord = quote
371
373
let err = $ checkerrors
372
374
if err === nothing
373
- msg = $ (message)
374
- kwargs = (;$ (log_data. kwargs... ))
375
+ $ ( msg) = $ (message)
376
+ $ ( kwargs) = (;$ (log_data. kwargs... ))
375
377
true
376
378
else
377
379
@invokelatest $ (logging_error)(logger, level, _module, group, id, file, line, err, false )
@@ -382,8 +384,8 @@ function logmsg_code(_module, file, line, level, message, exs...)
382
384
else
383
385
logrecord = quote
384
386
try
385
- msg = $ (esc (message))
386
- kwargs = (;$ (log_data. kwargs... ))
387
+ $ ( msg) = $ (esc (message))
388
+ $ ( kwargs) = (;$ (log_data. kwargs... ))
387
389
true
388
390
catch err
389
391
@invokelatest $ (logging_error)(logger, level, _module, group, id, file, line, err, true )
@@ -410,13 +412,13 @@ function logmsg_code(_module, file, line, level, message, exs...)
410
412
file = Base. fixup_stdlib_path (file)
411
413
end
412
414
line = $ (log_data. _line)
413
- local msg, kwargs
415
+ local $ ( msg), $ ( kwargs)
414
416
if $ (logrecord)
415
- @assert @isdefined ( msg) " Assertion to tell the compiler about the definedness of this variable"
416
- @assert @isdefined ( kwargs) " Assertion to tell the compiler about the definedness of this variable"
417
+ $ ( Expr ( :isdefined , msg)) || throw ( AssertionError ( " Assertion to tell the compiler about the definedness of this variable" ))
418
+ $ ( Expr ( :isdefined , kwargs)) || throw ( AssertionError ( " Assertion to tell the compiler about the definedness of this variable" ))
417
419
$ handle_message_nothrow (
418
- logger, level, msg, _module, group, id, file, line;
419
- kwargs... )
420
+ logger, level, $ ( msg) , _module, group, id, file, line;
421
+ $ ( kwargs) . .. )
420
422
end
421
423
end
422
424
end
0 commit comments