Skip to content

Implement support for BEGIN/END_ILLINK_FEATURE_SWITCH in CoreLib/EE interface validation #106151

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
Merged
jkoritzinsky merged 5 commits into from
Aug 9, 2024
Merged

Implement support for BEGIN/END_ILLINK_FEATURE_SWITCH in CoreLib/EE interface validation #106151

jkoritzinsky merged 5 commits into from
Aug 9, 2024

Conversation

@jkoritzinsky
Copy link
Member

@jkoritzinsky jkoritzinsky commented Aug 8, 2024

Fixes #55950.

Also remove an unused and undefined method from the CoreLib/EE interface

This was referenced Aug 8, 2024
Open
Closed
Closed
@elinor-fung
Copy link
Member

elinor-fung commented Aug 8, 2024 •
edited
Loading

Doesn't the normal (non-extended) check also need to be updated? OffsetAndSizes doesn't handle BEGIN/END_ILLINK_FEATURE_SWITCH, so CoreLibBinder::Check would fail trying to find the classes or fields?

runtime/src/coreclr/vm/binder.cpp

Lines 546 to 554 in 243715e

const CoreLibBinder::OffsetAndSizeCheck CoreLibBinder::OffsetsAndSizes[] =
{
#define DEFINE_CLASS_U(nameSpace, stringName, unmanagedType) \
{ PTR_CSTR((TADDR) g_ ## nameSpace ## NS ), PTR_CUTF8((TADDR) # stringName), sizeof(unmanagedType), 0, 0, 0 },
#define DEFINE_FIELD_U(stringName, unmanagedContainingType, unmanagedOffset) \
{ 0, 0, 0, PTR_CUTF8((TADDR) # stringName), offsetof(unmanagedContainingType, unmanagedOffset), sizeof(((unmanagedContainingType*)1)->unmanagedOffset) },
#include "corelib.h"
};

@jkoritzinsky
Copy link
Member Author

jkoritzinsky commented Aug 9, 2024

You're right! I've pushed an update with support in the regular Check method as well.

elinor-fung
elinor-fung reviewed Aug 9, 2024
View reviewed changes
@build-analysis build-analysis bot mentioned this pull request Aug 9, 2024
Closed
@jkoritzinsky jkoritzinsky merged commit 8fe777f into dotnet:main Aug 9, 2024
@jkoritzinsky jkoritzinsky deleted the extended-check-illink-feature-switch branch August 9, 2024 21:03
@github-actions github-actions bot locked and limited conversation to collaborators Sep 9, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@elinor-fung elinor-fung elinor-fung approved these changes

Assignees

@jkoritzinsky jkoritzinsky

Labels

area-AssemblyLoader-coreclr

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

BEGIN_ILLINK_FEATURE_SWITCH mechanism for corelib.h does not work with checked/debug runtime and a trimmed app

2 participants

@jkoritzinsky @elinor-fung