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

Exclude SVM test generators from test build #15

Merged
merged 4 commits into from
May 4, 2021
Merged

Exclude SVM test generators from test build #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0927a55
Exclude SVM test generators from test build
trylek May 2, 2021
2e194ea
Fix for the MethodFlags negative test
trylek May 2, 2021
4021db2
Fix Linux / OSX builds by adding parentheses to logical condition
trylek May 2, 2021
7f78ba8
Fix JIT source code formatting
trylek May 2, 2021
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
3 changes: 1 addition & 2 deletions src/coreclr/jit/importer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13862,8 +13862,7 @@ void Compiler::impImportBlockCode(BasicBlock* block)

JITDUMP(" %08X", resolvedToken.token);

eeGetCallInfo(&resolvedToken,
(prefixFlags & PREFIX_CONSTRAINED) ? &constrainedResolvedToken : nullptr,
eeGetCallInfo(&resolvedToken, (prefixFlags & PREFIX_CONSTRAINED) ? &constrainedResolvedToken : nullptr,
addVerifyFlag(combine(CORINFO_CALLINFO_SECURITYCHECKS, CORINFO_CALLINFO_LDFTN)),
&callInfo);

Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/vm/jitinterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8680,9 +8680,9 @@ CEEInfo::getMethodSigInternal(
// Otherwise we would end up with two secret generic dictionary arguments (since the stub also provides one).
//
BOOL isCallSiteThatGoesThroughInstantiatingStub =
signatureKind == SK_VIRTUAL_CALLSITE &&
(signatureKind == SK_VIRTUAL_CALLSITE &&
!ftn->IsStatic() &&
ftn->GetMethodTable()->IsInterface() ||
ftn->GetMethodTable()->IsInterface()) ||
signatureKind == SK_STATIC_VIRTUAL_CODEPOINTER_CALLSITE;
if (!isCallSiteThatGoesThroughInstantiatingStub)
sigRet->callConv = (CorInfoCallConv) (sigRet->callConv | CORINFO_CALLCONV_PARAMTYPE);
Expand Down
9 changes: 6 additions & 3 deletions src/coreclr/vm/methodtablebuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5037,10 +5037,13 @@ MethodTableBuilder::ValidateMethods()
}
}

// Virtual static methods are not allowed.
if (IsMdStatic(it.Attrs()) && IsMdVirtual(it.Attrs()) && !IsInterface())
// Virtual static methods are only allowed on interfaces and they must be abstract.
if (IsMdStatic(it.Attrs()) && IsMdVirtual(it.Attrs()))
{
BuildMethodTableThrowException(IDS_CLASSLOAD_STATICVIRTUAL, it.Token());
if (!IsInterface() || !IsMdAbstract(it.Attrs()))
{
BuildMethodTableThrowException(IDS_CLASSLOAD_STATICVIRTUAL, it.Token());
}
}
}
}
Expand Down
1 change: 1 addition & 0 deletions src/tests/Common/dirs.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<DisabledProjects Include="$(TestRoot)GC\Performance\Framework\GCPerfTestFramework.csproj" />
<DisabledProjects Include="$(TestRoot)Loader\classloader\generics\regressions\DD117522\Test.csproj" />
<DisabledProjects Include="$(TestRoot)Loader\classloader\generics\GenericMethods\VSW491668.csproj" /> <!-- issue 5501 -->
<DisabledProjects Include="$(TestRoot)Loader\classloader\StaticVirtualMethods\**\generatetest.csproj" /> <!-- test generators -->
<DisabledProjects Include="$(TestRoot)Performance\Scenario\JitBench\unofficial_dotnet\JitBench.csproj" /> <!-- no official build support for SDK-style netcoreapp2.0 projects -->
<DisabledProjects Include="$(TestRoot)reflection\GenericAttribute\GenericAttributeTests.csproj" />
<DisabledProjects Include="$(TestRoot)TestWrappers*\**\*.csproj" />
Expand Down