Skip to content

JIT: Set bbCodeOffsEnd to BAD_IL_OFFSET when expanding static init calls #100152

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
merged 2 commits into from
Mar 25, 2024
Merged

JIT: Set bbCodeOffsEnd to BAD_IL_OFFSET when expanding static init calls #100152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
071c789
Set bbCodeOffsEnd to BAD_IL_OFFSET when expanding static init calls
TIHan Mar 22, 2024
e9c57ea
Re-enable NativeAOT tests that were failing
TIHan Mar 22, 2024
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
11 changes: 2 additions & 9 deletions src/coreclr/jit/helperexpansion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1504,15 +1504,8 @@ bool Compiler::fgExpandStaticInitForCall(BasicBlock** pBlock, Statement* stmt, G
// Clear gtInitClsHnd as a mark that we've already visited this call
call->gtInitClsHnd = NO_CLASS_HANDLE;

// Update the IL offsets of the blocks to match the split.

// prevBb->bbCodeOffs remains the same
block->bbCodeOffsEnd = prevBb->bbCodeOffsEnd;

IL_OFFSET splitPointILOffset = fgFindBlockILOffset(block);

prevBb->bbCodeOffsEnd = max(prevBb->bbCodeOffs, splitPointILOffset);
block->bbCodeOffs = min(splitPointILOffset, block->bbCodeOffsEnd);
// The blocks and statements have been modified enough to make the ending offset invalid.
block->bbCodeOffsEnd = BAD_IL_OFFSET;

return true;
}
Expand Down
3 changes: 0 additions & 3 deletions src/tests/JIT/Stress/ABI/pinvokes_d.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<JitOptimizationSensitive>true</JitOptimizationSensitive>
<GCStressIncompatible>true</GCStressIncompatible>

<!-- https://github.com/dotnet/runtime/issues/100125 -->
<NativeAotIncompatible>true</NativeAotIncompatible>
</PropertyGroup>
<PropertyGroup>
<DebugType>Full</DebugType>
Expand Down
3 changes: 0 additions & 3 deletions src/tests/JIT/Stress/ABI/pinvokes_do.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<JitOptimizationSensitive>true</JitOptimizationSensitive>
<GCStressIncompatible>true</GCStressIncompatible>

<!-- https://github.com/dotnet/runtime/issues/100125 -->
<NativeAotIncompatible>true</NativeAotIncompatible>
</PropertyGroup>
<PropertyGroup>
<DebugType>Full</DebugType>
Expand Down
3 changes: 0 additions & 3 deletions src/tests/JIT/Stress/ABI/stubs_do.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<JitOptimizationSensitive>true</JitOptimizationSensitive>
<GCStressIncompatible>true</GCStressIncompatible>

<!-- https://github.com/dotnet/runtime/issues/100125 -->
<NativeAotIncompatible>true</NativeAotIncompatible>
</PropertyGroup>
<PropertyGroup>
<DebugType>Full</DebugType>
Expand Down
3 changes: 0 additions & 3 deletions src/tests/JIT/Stress/ABI/tailcalls_d.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<JitOptimizationSensitive>true</JitOptimizationSensitive>
<GCStressIncompatible>true</GCStressIncompatible>

<!-- https://github.com/dotnet/runtime/issues/100125 -->
<NativeAotIncompatible>true</NativeAotIncompatible>
</PropertyGroup>
<PropertyGroup>
<DebugType>Full</DebugType>
Expand Down
3 changes: 0 additions & 3 deletions src/tests/JIT/Stress/ABI/tailcalls_do.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<JitOptimizationSensitive>true</JitOptimizationSensitive>
<GCStressIncompatible>true</GCStressIncompatible>

<!-- https://github.com/dotnet/runtime/issues/100125 -->
<NativeAotIncompatible>true</NativeAotIncompatible>
</PropertyGroup>
<PropertyGroup>
<DebugType>Full</DebugType>
Expand Down