Skip to content

Fix MethodError in IR validator #58425

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 3 commits into from
May 16, 2025
Merged

Fix MethodError in IR validator #58425

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a43b03
Fix MethodError in IR validator
mlechu May 15, 2025
98e5818
Make `Core.io_pointer` return `jl_uv_stderr` as fallback
mlechu May 15, 2025
3b049a0
Revert "Make `Core.io_pointer` return `jl_uv_stderr` as fallback"
mlechu May 15, 2025
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
12 changes: 6 additions & 6 deletions Compiler/src/validation.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ const VALID_EXPR_HEADS = IdDict{Symbol,UnitRange{Int}}(
:aliasscope => 0:0,
:popaliasscope => 0:0,
:new_opaque_closure => 5:typemax(Int),
:import => 1:typemax(Int),
:using => 1:typemax(Int),
:export => 1:typemax(Int),
:public => 1:typemax(Int),
:latestworld => 0:0,
Expand Down Expand Up @@ -72,11 +70,13 @@ function maybe_validate_code(mi::MethodInstance, src::CodeInfo, kind::String)
if !isempty(errors)
for e in errors
if mi.def isa Method
println(stderr, "WARNING: Encountered invalid ", kind, " code for method ",
mi.def, ": ", e)
println(Core.stderr,
"WARNING: Encountered invalid ", kind,
" code for method ", mi.def, ": ", e)
else
println(stderr, "WARNING: Encountered invalid ", kind, " code for top level expression in ",
mi.def, ": ", e)
println(Core.stderr,
"WARNING: Encountered invalid ", kind,
" code for top level expression in ", mi.def, ": ", e)
end
end
error("")
Expand Down
2 changes: 1 addition & 1 deletion base/boot.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -796,7 +796,7 @@ struct CoreSTDERR <: IO end
const stdout = CoreSTDOUT()
const stderr = CoreSTDERR()
io_pointer(::CoreSTDOUT) = Intrinsics.pointerref(Intrinsics.cglobal(:jl_uv_stdout, Ptr{Cvoid}), 1, 1)
io_pointer(::CoreSTDERR) = Intrinsics.pointerref(Intrinsics.cglobal(:jl_uv_stderr, Ptr{Cvoid}), 1, 1)
io_pointer(::Any) = Intrinsics.pointerref(Intrinsics.cglobal(:jl_uv_stderr, Ptr{Cvoid}), 1, 1)

unsafe_write(io::IO, x::Ptr{UInt8}, nb::UInt) =
(ccall(:jl_uv_puts, Cvoid, (Ptr{Cvoid}, Ptr{UInt8}, UInt), io_pointer(io), x, nb); nb)
Expand Down