Skip to content

Fix undefined behavior in interpreter mixed union upcast #15042

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
straight-shoota merged 1 commit into from
Sep 28, 2024
Merged

Fix undefined behavior in interpreter mixed union upcast #15042

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
7 changes: 7 additions & 0 deletions spec/compiler/interpreter/unions_spec.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,13 @@ describe Crystal::Repl::Interpreter do
CRYSTAL
end

it "returns large union type (#15041)" do
interpret(<<-CRYSTAL).should eq(4_i64)
a = {3_i64, 4_i64} || nil
a.is_a?(Tuple) ? a[1] : 5_i64
CRYSTAL
end

it "put and remove from union in local var" do
interpret(<<-CRYSTAL).should eq(3)
a = 1 == 1 ? 2 : true
Expand Down
8 changes: 5 additions & 3 deletions src/compiler/crystal/interpreter/instructions.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1309,7 +1309,7 @@ require "./repl"
code: begin
tmp_stack = stack
stack_grow_by(union_size - from_size)
(tmp_stack - from_size).copy_to(tmp_stack - from_size + type_id_bytesize, from_size)
(tmp_stack - from_size).move_to(tmp_stack - from_size + type_id_bytesize, from_size)
(tmp_stack - from_size).as(Int64*).value = type_id.to_i64!
end,
disassemble: {
Expand All @@ -1319,6 +1319,8 @@ require "./repl"
put_reference_type_in_union: {
operands: [union_size : Int32],
code: begin
# `copy_to` here is valid only when `from_size <= type_id_bytesize`,
# which is always true
from_size = sizeof(Pointer(UInt8))
reference = (stack - from_size).as(UInt8**).value
type_id =
Expand Down Expand Up @@ -1462,7 +1464,7 @@ require "./repl"
tuple_indexer_known_index: {
operands: [tuple_size : Int32, offset : Int32, value_size : Int32],
code: begin
(stack - tuple_size).copy_from(stack - tuple_size + offset, value_size)
(stack - tuple_size).move_from(stack - tuple_size + offset, value_size)
aligned_value_size = align(value_size)
stack_shrink_by(tuple_size - value_size)
stack_grow_by(aligned_value_size - value_size)
Expand All @@ -1474,7 +1476,7 @@ require "./repl"
},
tuple_copy_element: {
operands: [tuple_size : Int32, old_offset : Int32, new_offset : Int32, element_size : Int32],
code: (stack - tuple_size + new_offset).copy_from(stack - tuple_size + old_offset, element_size),
code: (stack - tuple_size + new_offset).move_from(stack - tuple_size + old_offset, element_size),
},
# >>> Tuples (3)

Expand Down