From 60b081394eb37a7863dcf008e8640a5775aa5be7 Mon Sep 17 00:00:00 2001
From: Shuhei Kadowaki <aviatesk@gmail.com>
Date: Thu, 19 Jun 2025 21:01:56 +0900
Subject: [PATCH] inform compiler about local variable definedness

JET's new analysis pass now detects local variables that may be
undefined, which has revealed such issues in several functions within
Base (JuliaLang/julia#58762).

This commit addresses local variables whose definedness the compiler
cannot properly determine, primarily in functions reachable from JET's
test suite. No functional changes are made.
---
 base/logging/logging.jl | 10 +++++++---
 base/partr.jl           |  8 +++-----
 base/ryu/shortest.jl    |  1 +
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/base/logging/logging.jl b/base/logging/logging.jl
index b43b7d9faa594..25f4dbe4902be 100644
--- a/base/logging/logging.jl
+++ b/base/logging/logging.jl
@@ -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
diff --git a/base/partr.jl b/base/partr.jl
index 6053a584af5ba..d488330f0c87e 100644
--- a/base/partr.jl
+++ b/base/partr.jl
@@ -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
@@ -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
@@ -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
@@ -208,6 +204,8 @@ function multiq_deletemin()
         end
     end
 
+    @assert @isdefined(rn1) "Assertion to tell the compiler about the definedness of this variable"
+
     heap = tpheaps[rn1]
     task = heap.tasks[1]
     if ccall(:jl_set_task_tid, Cint, (Any, Cint), task, tid-1) == 0
diff --git a/base/ryu/shortest.jl b/base/ryu/shortest.jl
index 37024f18b4df1..b4ba8255e0b8a 100644
--- a/base/ryu/shortest.jl
+++ b/base/ryu/shortest.jl
@@ -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