Skip to content

Fix contract violations. #81727

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
AaronRobinsonMSFT merged 1 commit into from
Feb 7, 2023
Merged

Fix contract violations. #81727

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
8 changes: 3 additions & 5 deletions src/coreclr/vm/assemblyspec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,14 +149,12 @@ AssemblySpecHash::~AssemblySpecHash()

HRESULT AssemblySpec::InitializeSpecInternal(mdToken kAssemblyToken,
IMDInternalImport *pImport,
DomainAssembly *pStaticParent,
BOOL fAllowAllocation)
DomainAssembly *pStaticParent)
{
CONTRACTL
{
INSTANCE_CHECK;
if (fAllowAllocation) {GC_TRIGGERS;} else {GC_NOTRIGGER;};
if (fAllowAllocation) {INJECT_FAULT(COMPlusThrowOM());} else {FORBID_FAULT;};
GC_NOTRIGGER;
NOTHROW;
MODE_ANY;
PRECONDITION(pImport->IsValidToken(kAssemblyToken));
Expand Down Expand Up @@ -194,7 +192,7 @@ void AssemblySpec::InitializeSpec(PEAssembly * pFile)
{
INSTANCE_CHECK;
THROWS;
GC_TRIGGERS;
GC_NOTRIGGER;
MODE_ANY;
PRECONDITION(CheckPointer(pFile));
INJECT_FAULT(COMPlusThrowOM(););
Expand Down
7 changes: 3 additions & 4 deletions src/coreclr/vm/assemblyspec.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ class AssemblySpec : public BaseAssemblySpec

HRESULT InitializeSpecInternal(mdToken kAssemblyRefOrDef,
IMDInternalImport *pImport,
DomainAssembly *pStaticParent,
BOOL fAllowAllocation);
DomainAssembly *pStaticParent);

// InitializeSpecInternal should be used very carefully so it's made private.
// functions that take special care (and thus are allowed to use the function) are listed below
Expand Down Expand Up @@ -88,12 +87,12 @@ class AssemblySpec : public BaseAssemblySpec
CONTRACTL
{
INSTANCE_CHECK;
GC_TRIGGERS;
GC_NOTRIGGER;
THROWS;
MODE_ANY;
}
CONTRACTL_END;
HRESULT hr=InitializeSpecInternal(kAssemblyRefOrDef, pImport,pStaticParent,TRUE);
HRESULT hr=InitializeSpecInternal(kAssemblyRefOrDef, pImport,pStaticParent);
if(FAILED(hr))
EEFileLoadException::Throw(this,hr);
};
Expand Down
3 changes: 1 addition & 2 deletions src/coreclr/vm/ceeload.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2983,8 +2983,7 @@ Module::GetAssemblyIfLoaded(
AssemblySpec spec;
if (FAILED(spec.InitializeSpecInternal(kAssemblyRef,
pMDImport,
pCurAssemblyInExamineDomain,
FALSE /*fAllowAllocation*/)))
pCurAssemblyInExamineDomain)))
{
continue;
}
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/vm/peassembly.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,7 +738,7 @@ inline void PEAssembly::GetDisplayName(SString &result, DWORD flags)
{
PRECONDITION(CheckValue(result));
THROWS;
GC_TRIGGERS;
GC_NOTRIGGER;
MODE_ANY;
}
CONTRACTL_END;
Expand Down