Skip to content

inform compiler about local variable definedness #58778

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
Jun 20, 2025
Merged

inform compiler about local variable definedness #58778

Show file tree
Hide file tree
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
10 changes: 7 additions & 3 deletions base/logging/logging.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,9 +411,13 @@ function logmsg_code(_module, file, line, level, message, exs...)
end
line = $(log_data._line)
local msg, kwargs
$(logrecord) && $handle_message_nothrow(
logger, level, msg, _module, group, id, file, line;
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"
$handle_message_nothrow(
logger, level, msg, _module, group, id, file, line;
kwargs...)
end
end
end
end
Expand Down
8 changes: 3 additions & 5 deletions base/partr.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ function multiq_sift_down(heap::taskheap, idx::Int32)
end
end


function multiq_size(tpid::Int8)
nt = UInt32(Threads._nthreads_in_pool(tpid))
tp = tpid + 1
Expand Down Expand Up @@ -138,7 +137,6 @@ function multiq_size(tpid::Int8)
return heap_p
end


function multiq_insert(task::Task, priority::UInt16)
tpid = ccall(:jl_get_task_threadpoolid, Int8, (Any,), task)
@assert tpid > -1
Expand Down Expand Up @@ -171,10 +169,8 @@ function multiq_insert(task::Task, priority::UInt16)
return true
end


function multiq_deletemin()
local rn1, rn2
local prio1, prio2
local rn1::UInt32

tid = Threads.threadid()
tp = ccall(:jl_threadpoolid, Int8, (Int16,), tid-1) + 1
Expand Down Expand Up @@ -208,6 +204,8 @@ function multiq_deletemin()
end
end

@assert @isdefined(rn1) "Assertion to tell the compiler about the definedness of this variable"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be a comment instead of a string?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe, but I'm not sure what to put for the assertion string. Any idea?


heap = tpheaps[rn1]
task = heap.tasks[1]
if ccall(:jl_set_task_tid, Cint, (Any, Cint), task, tid-1) == 0
Expand Down
1 change: 1 addition & 0 deletions base/ryu/shortest.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ integer. If a `maxsignif` argument is provided, then `b < maxsignif`.
e10 = 0

if maxsignif !== nothing && b > maxsignif
roundup = false
b_allzero = true
# reduce to max significant digits
while true
Expand Down