Move stgpool to md subsystem, extract memory streams, eliminate VM dependencies on MD internals #122723

Copilot · 2025-12-24T06:03:50Z

Fixes #35624

Moved stgpool.h, stgpooli.h from src/coreclr/inc/ to src/coreclr/md/inc/
Moved stgpool.cpp, stgpooli.cpp, stgpoolreadonly.cpp from src/coreclr/utilcode/ to src/coreclr/md/runtime/
Moved CPackedLen struct from stgpooli.h to src/coreclr/inc/mdfileformat.h
Moved CInMemoryStream and CGrowableStream from stgpool.* to memorystreams.*
Replaced CDescPool with standalone implementation

…pendency Co-authored-by: jkotas <[email protected]>

…m and add min/max to stdafx.h Co-authored-by: jkotas <[email protected]>

jkotas

@copilot address feedback

src/coreclr/debug/di/module.cpp

src/coreclr/md/ceefilegen/cceegen.cpp

src/coreclr/md/heaps/external.h

src/coreclr/vm/commtmemberinfomap.h

…e throwing new in CDescPool Co-authored-by: jkotas <[email protected]>

src/coreclr/vm/common.h

src/coreclr/vm/commtmemberinfomap.h

Co-authored-by: jkotas <[email protected]>

jkotas

@copilot address feedback

src/coreclr/inc/formattype.h

src/coreclr/vm/common.h

jkotas · 2025-12-24T16:40:18Z

@copilot I see a lot of build breaks in the new memorystreams.h/.cpp:

2025-12-24T13:33:24.6276312Z   /__w/1/s/src/coreclr/inc/memoryrange.h:40:9: error: use of undeclared identifier 'SUPPORTS_DAC'
2025-12-24T13:33:24.6276951Z      40 |         SUPPORTS_DAC;
2025-12-24T13:33:24.6279217Z         |         ^~~~~~~~~~~~
2025-12-24T13:33:24.6281515Z   /__w/1/s/src/coreclr/inc/memoryrange.h:47:9: error: use of undeclared identifier 'SUPPORTS_DAC'
2025-12-24T13:33:24.6283726Z      47 |         SUPPORTS_DAC;
2025-12-24T13:33:24.6285911Z         |         ^~~~~~~~~~~~
2025-12-24T13:33:24.6336935Z   /__w/1/s/src/coreclr/inc/memoryrange.h:57:9: error: use of undeclared identifier 'LIMITED_METHOD_DAC_CONTRACT'
2025-12-24T13:33:24.6339567Z      57 |         LIMITED_METHOD_DAC_CONTRACT;
2025-12-24T13:33:24.6341777Z         |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~
2025-12-24T13:33:24.6404244Z   /__w/1/s/src/coreclr/inc/memoryrange.h:65:9: error: use of undeclared identifier 'LIMITED_METHOD_DAC_CONTRACT'
2025-12-24T13:33:24.6430500Z      65 |         LIMITED_METHOD_DAC_CONTRACT;
2025-12-24T13:33:24.6431167Z         |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~
2025-12-24T13:33:24.6431911Z   /__w/1/s/src/coreclr/inc/memoryrange.h:73:9: error: use of undeclared identifier 'SUPPORTS_DAC'
2025-12-24T13:33:24.6447962Z      73 |         SUPPORTS_DAC;
2025-12-24T13:33:24.6453606Z         |         ^~~~~~~~~~~~
2025-12-24T13:33:24.6461318Z   /__w/1/s/src/coreclr/inc/memoryrange.h:80:9: error: use of undeclared identifier 'SUPPORTS_DAC'
2025-12-24T13:33:24.6461976Z      80 |         SUPPORTS_DAC;
2025-12-24T13:33:24.6462530Z         |         ^~~~~~~~~~~~
2025-12-24T13:33:24.6463090Z   In file included from /__w/1/s/src/coreclr/utilcode/memorystreams.cpp:11:
2025-12-24T13:33:24.6463772Z   /__w/1/s/src/coreclr/inc/memorystreams.h:22:32: error: base class has incomplete type
2025-12-24T13:33:24.6464119Z      22 | class CInMemoryStream : public IStream
2025-12-24T13:33:24.6464405Z         |                         ~~~~~~~^~~~~~~
2025-12-24T13:33:24.6464729Z   /__w/1/s/src/coreclr/pal/inc/rt/palrt.h:313:11: note: forward declaration of 'IStream'
2025-12-24T13:33:24.6465064Z     313 | interface IStream;
2025-12-24T13:33:24.6465312Z         |           ^
2025-12-24T13:33:24.6493301Z   In file included from /__w/1/s/src/coreclr/utilcode/memorystreams.cpp:11:
2025-12-24T13:33:24.6520610Z   /__w/1/s/src/coreclr/inc/memorystreams.h:127:9: error: unknown type name 'STATSTG'
2025-12-24T13:33:24.6521297Z     127 |         STATSTG     *pstatstg,
2025-12-24T13:33:24.6521909Z         |         ^
2025-12-24T13:33:24.6582947Z   /__w/1/s/src/coreclr/inc/memorystreams.h:31:7: error: use of undeclared identifier 'LIMITED_METHOD_CONTRACT'
2025-12-24T13:33:24.6587706Z      31 |     { LIMITED_METHOD_CONTRACT; }
2025-12-24T13:33:24.6589547Z         |       ^~~~~~~~~~~~~~~~~~~~~~~
2025-12-24T13:33:24.6664254Z   /__w/1/s/src/coreclr/inc/memorystreams.h:39:9: error: use of undeclared identifier 'LIMITED_METHOD_CONTRACT'
2025-12-24T13:33:24.6666332Z      39 |         LIMITED_METHOD_CONTRACT;

Please address them and make sure that the build succeeds.

src/coreclr/vm/commtmemberinfomap.cpp

… to 3) Co-authored-by: jkotas <[email protected]>

src/coreclr/vm/commtmemberinfomap.cpp

src/coreclr/debug/di/module.cpp

Co-authored-by: jkotas <[email protected]>

Copilot

Pull request overview

This PR successfully refactors the metadata (MD) subsystem to eliminate VM dependencies on MD internal implementation details by relocating stgpool files, extracting memory stream classes, and reimplementing CDescPool.

Key changes:

Moved stgpool files from shared inc/utilcode to MD-specific directories (md/inc and md/runtime)
Extracted CInMemoryStream and CGrowableStream to new memorystreams.h/cpp files in inc/utilcode
Refactored CDescPool from StgPool inheritance to standalone allocator with flexible array members
Moved CPackedLen struct from stgpooli.h to mdfileformat.h for broader reusability

Reviewed changes

Copilot reviewed 22 out of 24 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
src/coreclr/vm/commtmemberinfomap.h	Reimplemented CDescPool as standalone allocator with segmented memory management
src/coreclr/vm/commtmemberinfomap.cpp	Updated CDescPool call sites to use size_t types and removed unnecessary null checks
src/coreclr/vm/common.h	Changed include from stgpool.h to memorystreams.h
src/coreclr/vm/mlinfo.cpp	Added mdfileformat.h include for CPackedLen
src/coreclr/utilcode/memorystreams.cpp	New file containing CInMemoryStream and CGrowableStream implementations
src/coreclr/utilcode/CMakeLists.txt	Removed stgpool files, added memorystreams.cpp
src/coreclr/md/runtime/stgpool.cpp	Removed memory stream classes (moved to memorystreams.cpp)
src/coreclr/md/runtime/stgpooli.cpp	New location for stgpooli implementation
src/coreclr/md/runtime/stgpoolreadonly.cpp	New location for read-only pool implementation
src/coreclr/md/runtime/stdafx.h	Added using declarations for std::min/max
src/coreclr/md/runtime/CMakeLists.txt	Added stgpool files to MD runtime build
src/coreclr/md/inc/stgpool.h	New location, removed memory stream class definitions
src/coreclr/md/inc/stgpooli.h	New location with forward declaration for CPackedLen
src/coreclr/md/inc/streamutil.h	Removed unused NullStream class
src/coreclr/md/compiler/regmeta_emit.cpp	Added memorystreams.h include
src/coreclr/md/ceefilegen/cceegen.cpp	Changed include from stgpool.h to memorystreams.h
src/coreclr/inc/stgpooli.h	Deleted (moved to md/inc)
src/coreclr/inc/memorystreams.h	New file with CInMemoryStream and CGrowableStream declarations
src/coreclr/inc/memoryrange.h	Added contract.h include, removed blank lines
src/coreclr/inc/mdfileformat.h	Added CPackedLen struct definition
src/coreclr/inc/formattype.cpp	Removed Debug_ReportError call
src/coreclr/inc/caparser.h	Changed include from stgpooli.h to mdfileformat.h
src/coreclr/ilasm/ilasmpch.h	Removed stgpooli.h include (now in mdfileformat.h)
src/coreclr/debug/di/module.cpp	Changed include from stgpool.h to memorystreams.h

src/coreclr/utilcode/memorystreams.cpp

src/coreclr/inc/memorystreams.h

src/coreclr/utilcode/memorystreams.cpp

src/coreclr/vm/commtmemberinfomap.cpp

Co-authored-by: Copilot <[email protected]>

Initial plan

44d10c2

Copilot AI assigned Copilot and jkotas Dec 24, 2025

Copilot started work on behalf of jkotas December 24, 2025 06:04 View session

Copilot AI and others added 2 commits December 24, 2025 06:32

Move stgpool files to md and reimplement CDescPool without StgPool de…

19c3517

…pendency Co-authored-by: jkotas <[email protected]>

Fix build by including stgpool.h from new location for CGrowableStrea…

9e7f88e

…m and add min/max to stdafx.h Co-authored-by: jkotas <[email protected]>

Copilot AI changed the title ~~[WIP] Clean up src/coreclr/src/inc by removing private details~~ Move stgpool to md subsystem and eliminate CDescPool dependency on StgPool Dec 24, 2025

Copilot AI requested a review from jkotas December 24, 2025 06:55

Copilot finished work on behalf of jkotas December 24, 2025 06:55

jkotas reviewed Dec 24, 2025

View reviewed changes

src/coreclr/debug/di/module.cpp Outdated Show resolved Hide resolved

src/coreclr/md/ceefilegen/cceegen.cpp Outdated Show resolved Hide resolved

src/coreclr/md/heaps/external.h Outdated Show resolved Hide resolved

src/coreclr/vm/commtmemberinfomap.h Outdated Show resolved Hide resolved

Copilot started work on behalf of jkotas December 24, 2025 07:03 View session

Address PR feedback: simplify stgpool includes in md subsystem and us…

8016870

…e throwing new in CDescPool Co-authored-by: jkotas <[email protected]>

Copilot finished work on behalf of jkotas December 24, 2025 07:32

Copilot AI requested a review from jkotas December 24, 2025 07:32

build-analysis bot mentioned this pull request Dec 24, 2025

Unable to pull image from mcr.microsoft.com #117164

Open

jkotas reviewed Dec 24, 2025

View reviewed changes

src/coreclr/vm/common.h Outdated Show resolved Hide resolved

Copilot started work on behalf of jkotas December 24, 2025 12:34 View session

jkotas reviewed Dec 24, 2025

View reviewed changes

src/coreclr/vm/commtmemberinfomap.h Outdated Show resolved Hide resolved

Move CGrowableStream and CInMemoryStream to new memorystreams files

d6dd591

Co-authored-by: jkotas <[email protected]>

Copilot AI changed the title ~~Move stgpool to md subsystem and eliminate CDescPool dependency on StgPool~~ Move stgpool to md subsystem, extract memory streams, and eliminate CDescPool dependency on StgPool Dec 24, 2025

Copilot AI requested a review from jkotas December 24, 2025 13:07

Copilot finished work on behalf of jkotas December 24, 2025 13:07

Copilot started work on behalf of jkotas December 24, 2025 13:07 View session

am11 added the area-VM-coreclr label Dec 24, 2025

Simplify CDescPool and fix includes for memorystreams extraction

1076d0a

Co-authored-by: jkotas <[email protected]>

Copilot finished work on behalf of jkotas December 24, 2025 13:25

build-analysis bot mentioned this pull request Dec 24, 2025

[android][arm64] System.Net.Sockets.Tests.SendTo_SyncForceNonBlocking.Datagram_UDP_ShouldImplicitlyBindLocalEndpoint fails with NetworkUnreachable #120526

Open

jkotas reviewed Dec 24, 2025

View reviewed changes

src/coreclr/inc/formattype.h Outdated Show resolved Hide resolved

src/coreclr/vm/common.h Outdated Show resolved Hide resolved

Copilot started work on behalf of jkotas December 24, 2025 16:39 View session

Copilot AI requested a review from jkotas December 27, 2025 07:37

Copilot finished work on behalf of jkotas December 27, 2025 07:37

jkotas reviewed Dec 27, 2025

View reviewed changes

src/coreclr/vm/commtmemberinfomap.cpp Outdated Show resolved Hide resolved

Update src/coreclr/vm/commtmemberinfomap.cpp

2d86f9f

jkotas reviewed Dec 27, 2025

View reviewed changes

src/coreclr/vm/commtmemberinfomap.cpp Outdated Show resolved Hide resolved

Copilot started work on behalf of jkotas December 27, 2025 07:47 View session

Remove obsolete comment and correct buffer size calculation (change 4…

5197470

… to 3) Co-authored-by: jkotas <[email protected]>

Copilot AI requested a review from jkotas December 27, 2025 07:56

Copilot finished work on behalf of jkotas December 27, 2025 07:56

jkotas reviewed Dec 27, 2025

View reviewed changes

src/coreclr/vm/commtmemberinfomap.cpp Show resolved Hide resolved

Update src/coreclr/vm/commtmemberinfomap.cpp

3d8d644

jkotas reviewed Dec 27, 2025

View reviewed changes

src/coreclr/debug/di/module.cpp Outdated Show resolved Hide resolved

Copilot started work on behalf of jkotas December 27, 2025 08:03 View session

Remove unnecessary stgpool.h include from module.cpp

3c59717

Co-authored-by: jkotas <[email protected]>

Copilot AI requested a review from jkotas December 27, 2025 08:12

Copilot finished work on behalf of jkotas December 27, 2025 08:12

Fixes

3c7c1c1

build-analysis bot mentioned this pull request Dec 28, 2025

[Android][CoreCLR] System.Security.Cryptography.Tests killed by lowmemorykiller #118603

Open

jkotas marked this pull request as ready for review December 28, 2025 13:57

Copilot AI review requested due to automatic review settings December 28, 2025 13:57

Copilot started reviewing on behalf of jkotas December 28, 2025 13:58 View session

Copilot AI reviewed Dec 28, 2025

View reviewed changes

src/coreclr/utilcode/memorystreams.cpp Outdated Show resolved Hide resolved

src/coreclr/inc/memorystreams.h Show resolved Hide resolved

src/coreclr/utilcode/memorystreams.cpp Outdated Show resolved Hide resolved

src/coreclr/vm/commtmemberinfomap.cpp Outdated Show resolved Hide resolved

jkotas and others added 3 commits December 28, 2025 06:05

Update src/coreclr/vm/commtmemberinfomap.cpp

d3587b9

Co-authored-by: Copilot <[email protected]>

Update src/coreclr/utilcode/memorystreams.cpp

66ad854

Co-authored-by: Copilot <[email protected]>

Update src/coreclr/utilcode/memorystreams.cpp

e3cec86

Co-authored-by: Copilot <[email protected]>

jkotas requested a review from jkoritzinsky December 28, 2025 14:06

jkoritzinsky approved these changes Dec 29, 2025

View reviewed changes

Delete dummy file

43dcbdb

jkotas merged commit d21d7f7 into main Dec 30, 2025
116 checks passed

jkotas deleted the copilot/remove-private-implementation-details branch December 30, 2025 14:03

Move stgpool to md subsystem, extract memory streams, eliminate VM dependencies on MD internals #122723

Move stgpool to md subsystem, extract memory streams, eliminate VM dependencies on MD internals #122723

Uh oh!

Conversation

Copilot AI commented Dec 24, 2025 • edited by jkotas Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jkotas left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jkotas left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

jkotas commented Dec 24, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Copilot AI commented Dec 24, 2025 •

edited by jkotas

Loading