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.

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

Fix layout with packed class that only has a vtable #1495

Merged
merged 1 commit into from
Jan 18, 2019

Conversation

tromey
Copy link
Contributor

@tromey tromey commented Jan 18, 2019

I noticed that a #pragma packed class that has only a vtable but no
data members is not marked repr(packed). The bug is that is_packed
examines data members but not the vtable when applying its heuristic.

I noticed that a `#pragma packed` class that has only a vtable but no
data members is not marked repr(packed).  The bug is that is_packed
examines data members but not the vtable when applying its heuristic.
@highfive
Copy link

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!

Copy link
Contributor

@emilio emilio left a comment

Choose a reason for hiding this comment

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

Thanks, that's a really nice catch! Just one question.

@@ -1517,6 +1517,10 @@ impl CompInfo {
}) {
info!("Found a struct that was defined within `#pragma packed(...)`");
return true;
} else if self.has_own_virtual_method {
Copy link
Contributor

Choose a reason for hiding this comment

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

Should this really be an else condition?

Or should it be:

// ..
}

if self.has_own_virtual_method && parent_layout.align == 1 {
    return 1;
}

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It passes either way, so I guess it doesn't really matter. A class without data members won't ever pass that first condition. I can reword it if you like.

Copy link
Contributor

Choose a reason for hiding this comment

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

No, that's fine, I was wondering if this would allow catching stuff where we don't know the layout of the members because libclang doesn't expose it, yet we know we have a vtable. Anyhow this is fine.

@emilio emilio merged commit 7a5ae20 into rust-lang:master Jan 18, 2019
@tromey tromey deleted the packed-only-vtable branch January 19, 2019 03:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants