Skip to content
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

Jump to bottom

Don't generate unique type IDs for virtual metaclasses #11188

Merged
merged 1 commit into from
Sep 13, 2021
Merged

Don't generate unique type IDs for virtual metaclasses #11188

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
4 changes: 3 additions & 1 deletion src/compiler/crystal/codegen/codegen.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -770,7 +770,9 @@ module Crystal
end

def visit(node : TypeOf)
@last = type_id(node.type)
# convert virtual metaclasses to non-virtual ones, because only the
# non-virtual type IDs are needed
@last = type_id(node.type.devirtualize)
false
end

Expand Down
4 changes: 4 additions & 0 deletions src/compiler/crystal/codegen/llvm_id.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ module Crystal
type_id(type.typedef)
end

def type_id(type : VirtualType | VirtualMetaclassType)
raise "BUG: called type_id for #{type} (#{type.class})"
end

def type_id(type)
min_max = @ids[type]?
if min_max
Expand Down
9 changes: 0 additions & 9 deletions src/compiler/crystal/codegen/match.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,6 @@ class Crystal::CodeGenVisitor
)
end

private def create_match_fun_body(type : VirtualMetaclassType, type_id)
result = equal? type_id(type), type_id
type.each_concrete_type do |sub_type|
sub_type_cond = equal? type_id(sub_type), type_id
result = or(result, sub_type_cond)
end
ret result
end

private def create_match_fun_body(type, type_id)
result = nil
type.each_concrete_type do |sub_type|
Expand Down