Skip to content

Make ObjectStackAllocationTests work correctly under crossgen2 #40096

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
davidwrighton merged 1 commit into from
Jul 29, 2020
Merged

Make ObjectStackAllocationTests work correctly under crossgen2 #40096

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
3 changes: 0 additions & 3 deletions src/coreclr/tests/issues.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -923,9 +923,6 @@
<ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/tailcall_v4/hijacking/*">
<Issue>https://github.com/dotnet/runtime/issues/7597</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/opt/ObjectStackAllocation/ObjectStackAllocationTests/*">
<Issue>Not compatible with crossgen2</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/clr-x64-JIT/v4.0/devdiv374539/DevDiv_374539/*">
<Issue>https://github.com/dotnet/runtime/issues/32732</Issue>
</ExcludeList>
Expand Down
4 changes: 4 additions & 0 deletions src/coreclr/tests/src/CLRTest.CrossGen.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ if [ ! -z ${RunCrossGen2+x} ]%3B then
fi
fi

ExtraCrossGen2Args+=" $(CrossGen2TestExtraArguments)"

if [ ! -z ${LargeVersionBubble+x} ]%3B then
ExtraCrossGen2Args+=" --inputbubble"
fi
Expand Down Expand Up @@ -174,6 +176,8 @@ if defined RunCrossGen (
)
REM CrossGen2 Script
if defined RunCrossGen2 (
set ExtraCrossGen2Args=!ExtraCrossGen2Args! $(CrossGen2TestExtraArguments)

if defined LargeVersionBubble ( set ExtraCrossGen2Args=!ExtraCrossGen2Args! --inputbubble)
call :TakeLock
set CrossGen2Status=0
Expand Down
8 changes: 7 additions & 1 deletion src/tests/JIT/opt/ObjectStackAllocation/ObjectStackAllocationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public static int Main()
Console.WriteLine("GCStress is enabled");
expectedAllocationKind = AllocationKind.Undefined;
}
else if (!SPCOptimizationsEnabled()) {
else if (!SPCOptimizationsEnabled() && !Crossgen2Test()) {
Console.WriteLine("System.Private.CoreLib.dll optimizations are disabled");
expectedAllocationKind = AllocationKind.Heap;
}
Expand Down Expand Up @@ -181,6 +181,12 @@ static bool GCStressEnabled()
return Environment.GetEnvironmentVariable("COMPlus_GCStress") != null;
}

static bool Crossgen2Test()
{
// CrossGen2 doesn't respect the debuggable attribute
return Environment.GetEnvironmentVariable("RunCrossGen2") != null;
}

static void CallTestAndVerifyAllocation(Test test, int expectedResult, AllocationKind expectedAllocationsKind)
{
long allocatedBytesBefore = GC.GetAllocatedBytesForCurrentThread();
Expand Down
1 change: 1 addition & 0 deletions src/tests/JIT/opt/ObjectStackAllocation/ObjectStackAllocationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<Compile Include="$(MSBuildProjectName).cs" />
</ItemGroup>
<PropertyGroup>
<CrossGen2TestExtraArguments>--codegenopt JitObjectStackAllocation=1</CrossGen2TestExtraArguments>
<CLRTestBatchPreCommands><![CDATA[
$(CLRTestBatchPreCommands)
set COMPlus_TieredCompilation=0
Expand Down