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.

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

NativeAOT: Partially expand static initialization #83911

Merged
merged 40 commits into from
Apr 8, 2023
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
7100058
Expand static initialization in JIT
EgorBo Mar 24, 2023
023e2c8
Clean up
EgorBo Mar 24, 2023
6019949
Address feedback, clean up
EgorBo Mar 25, 2023
791244b
Address feedback, baby steps towards NAOT impl
EgorBo Mar 25, 2023
4f7c857
Remove test that always expects CORINFO_HELP_GETSHARED_NONGCSTATIC_BA…
EgorBo Mar 25, 2023
620bbd1
NativeAOT non-GC impl
EgorBo Mar 25, 2023
4279269
Fix NAOT
EgorBo Mar 25, 2023
7b9a259
Enable GC statics for NativeAOT
EgorBo Mar 25, 2023
a79eba7
Merge branch 'main' of github.com:dotnet/runtime into expand-static-init
EgorBo Mar 25, 2023
c1744bc
Fix assert
EgorBo Mar 25, 2023
141e99e
code clean up
EgorBo Mar 25, 2023
9ab6dc1
Merge branch 'main' of github.com:dotnet/runtime into expand-static-init
EgorBo Mar 25, 2023
0131b3c
Merge branch 'main' of github.com:dotnet/runtime into expand-static-init
EgorBo Mar 26, 2023
e073da4
Flip condition to "*isInited == 1"
EgorBo Mar 26, 2023
5256957
Update comments
EgorBo Mar 26, 2023
6cb5d30
Merge branch 'main' of github.com:dotnet/runtime into expand-static-init
EgorBo Mar 27, 2023
bc46cbd
Split getIsClassInitedFieldAddress into two functions
EgorBo Mar 27, 2023
9229e5d
Cache static base to a local
EgorBo Mar 27, 2023
95f0f7a
Merge branch 'main' of github.com:dotnet/runtime into expand-static-init
EgorBo Mar 27, 2023
bebf956
Merge branch 'main' of github.com:dotnet/runtime into expand-static-init
EgorBo Apr 3, 2023
86ccf98
Update src/coreclr/tools/aot/ILCompiler.RyuJit/JitInterface/CorInfoIm…
EgorBo Apr 3, 2023
96bd745
Address feedback
EgorBo Apr 3, 2023
efa8dfa
clean up
EgorBo Apr 3, 2023
c3f389b
Address feedback
EgorBo Apr 3, 2023
61bf741
Address feedback
EgorBo Apr 3, 2023
19d1484
use GTF_ICON_GLOBAL_PTR
EgorBo Apr 3, 2023
6d7ea49
Merge branch 'main' of github.com:dotnet/runtime into expand-static-init
EgorBo Apr 5, 2023
742c948
Update src/coreclr/jit/flowgraph.cpp
EgorBo Apr 5, 2023
dbb4a0c
Update src/coreclr/jit/flowgraph.cpp
EgorBo Apr 5, 2023
deb4eb6
Update src/coreclr/jit/flowgraph.cpp
EgorBo Apr 5, 2023
f0a44ba
Update src/coreclr/jit/flowgraph.cpp
EgorBo Apr 5, 2023
9b11b91
Merge branch 'expand-static-init' of github.com:EgorBo/runtime-1 into…
EgorBo Apr 5, 2023
2570f84
formatting
EgorBo Apr 5, 2023
16c75b2
Address feedback (1st round)
EgorBo Apr 5, 2023
2bbf5bf
Address feedback (round 2)
EgorBo Apr 6, 2023
ddc1731
Address feedback
EgorBo Apr 6, 2023
f65d080
Fix assert on NAOT
EgorBo Apr 6, 2023
c7bc7d8
Apply suggestions from code review
EgorBo Apr 6, 2023
6d1d18a
Update src/coreclr/jit/flowgraph.cpp
EgorBo Apr 6, 2023
cc56182
Address feedback
EgorBo Apr 6, 2023
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
4 changes: 4 additions & 0 deletions src/coreclr/jit/compiler.h
Original file line number Diff line number Diff line change
Expand Up @@ -5306,7 +5306,11 @@ class Compiler
void SplitTreesRandomly();
void SplitTreesRemoveCommas();
PhaseStatus fgExpandRuntimeLookups();

bool fgExpandStaticInitForBlock(BasicBlock* block);
bool fgExpandStaticInitForCall(BasicBlock* block, Statement* stmt, GenTreeCall* call);
PhaseStatus fgExpandStaticInit();

PhaseStatus fgInsertGCPolls();
BasicBlock* fgCreateGCPoll(GCPollType pollType, BasicBlock* block);

Expand Down
Loading