Consolidate classlibnative directory into vm#122780
Merged
Conversation
Co-authored-by: jkotas <[email protected]>
Co-authored-by: jkotas <[email protected]>
Copilot
AI
changed the title
[WIP] Move files from classlibnative to vm directory
Consolidate classlibnative directory into vm
Dec 30, 2025
This was referenced Dec 30, 2025
jkotas
reviewed
Dec 30, 2025
jkotas
reviewed
Dec 30, 2025
Member
|
@copilot Move SystemNative::IsServerGC to GCInterface::IsServerGC |
Member
|
@copilot Delete SystemNative::CaptureStackTraceData . It looks like a dead code |
Co-authored-by: jkotas <[email protected]>
Member
|
@copilot Fold objectnative.cpp/.h into comutilnative.cpp/.h |
Member
|
@copilot Factor out all GC-related code from comutilnative.cpp/.h to gchelpersnative.cpp/.h |
jkotas
reviewed
Dec 30, 2025
…rverGC to GCInterface, delete dead code Co-authored-by: jkotas <[email protected]>
…omutilnative Co-authored-by: jkotas <[email protected]>
Contributor
Author
Done in f075b0e
Created gchelpersnative.h in f075b0e. The implementation file and code extraction from comutilnative.cpp is a larger refactoring (~920 lines) that I'll continue working on. Would you like me to complete this in the current PR or defer it to a follow-up? |
jkotas
reviewed
Dec 30, 2025
Co-authored-by: jkotas <[email protected]>
Co-authored-by: jkotas <[email protected]>
jkotas
force-pushed
the
copilot/move-files-to-vm-directory
branch
from
5f555a2 to
6cd3bc0
Compare
jkotas
force-pushed
the
copilot/move-files-to-vm-directory
branch
from
6cd3bc0 to
07856ce
Compare
jkotas
changed the title
3 tasks
jkotas
requested review from
steveisok,
thaystg and
vitek-karas
as code owners
Contributor
There was a problem hiding this comment.
Pull request overview
This PR consolidates the classlibnative directory structure into the vm directory to simplify the CoreCLR codebase organization. The changes primarily involve moving files and updating build configurations, with minimal code changes.
Key Changes
- Moved all remaining files from
src/coreclr/classlibnativesubdirectories (bcltypeandfloat) intosrc/coreclr/vm - Updated include paths and build configurations to reflect the new file locations
- Removed unused GC pressure tracking code from RCW (Runtime Callable Wrapper)
- Updated
FreeExceptionDatato be GC_NOTRIGGER instead of GC_TRIGGERS
Reviewed changes
Copilot reviewed 25 out of 36 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
src/mono/mono/metadata/sysmath.c |
Updated comment to reference new file locations in vm directory |
src/coreclr/vm/varargsnative.h |
New file moved from classlibnative/bcltype |
src/coreclr/vm/varargsnative.cpp |
New file moved from classlibnative/bcltype |
src/coreclr/vm/runtimecallablewrapper.h |
Removed unused GC pressure tracking enum and methods |
src/coreclr/vm/runtimecallablewrapper.cpp |
Removed unused GC pressure tracking implementation and objectnative.h include |
src/coreclr/vm/qcallentrypoints.cpp |
Updated includes: variant.h → olevariant.h, removed obsolete includes |
src/coreclr/vm/olevariant.h |
Added Variant_ConvertValueTypeToRecord declaration |
src/coreclr/vm/olevariant.cpp |
Added Variant_ConvertValueTypeToRecord implementation |
src/coreclr/vm/floatsingle.h |
New file moved from classlibnative/float |
src/coreclr/vm/floatsingle.cpp |
New file moved from classlibnative/float |
src/coreclr/vm/floatdouble.h |
New file moved from classlibnative/float |
src/coreclr/vm/floatdouble.cpp |
New file moved from classlibnative/float |
src/coreclr/vm/excep.h |
Added FreeExceptionData declaration under FEATURE_COMINTEROP |
src/coreclr/vm/excep.cpp |
Changed FreeExceptionData to GC_NOTRIGGER, removed thread check and CONTRACT_VIOLATION |
src/coreclr/vm/ecalllist.h |
Updated function references: SystemNative → EnvironmentNative/GCInterface |
src/coreclr/vm/divmodint.h |
New file moved from classlibnative/float |
src/coreclr/vm/divmodint.cpp |
New file moved from classlibnative/float |
src/coreclr/vm/corelib.cpp |
Updated includes: variant.h → olevariant.h, removed obsolete includes |
src/coreclr/vm/comutilnative.h |
Added EnvironmentNative and ObjectNative class declarations, removed unused declarations |
src/coreclr/vm/comutilnative.cpp |
Added implementations for EnvironmentNative and ObjectNative methods |
src/coreclr/vm/arraynative.inl |
New file moved from classlibnative/bcltype |
src/coreclr/vm/arraynative.h |
New file moved from classlibnative/bcltype |
src/coreclr/vm/arraynative.cpp |
New file moved from classlibnative/bcltype |
src/coreclr/vm/CMakeLists.txt |
Added new source and header files to build |
src/coreclr/vm/.vscode/c_cpp_properties.json |
Removed classlibnative include paths |
src/coreclr/dlls/mscoree/coreclr/CMakeLists.txt |
Removed bcltype and comfloat_wks library dependencies |
src/coreclr/classlibnative/float/CMakeLists.txt |
Deleted (files moved to vm) |
src/coreclr/classlibnative/bcltype/variant.h |
Deleted (consolidated into olevariant.h) |
src/coreclr/classlibnative/bcltype/variant.cpp |
Deleted (consolidated into olevariant.cpp) |
src/coreclr/classlibnative/bcltype/system.h |
Deleted (functionality moved to comutilnative.h) |
src/coreclr/classlibnative/bcltype/system.cpp |
Deleted (functionality moved to comutilnative.cpp) |
src/coreclr/classlibnative/bcltype/objectnative.h |
Deleted (moved to comutilnative.h) |
src/coreclr/classlibnative/bcltype/objectnative.cpp |
Deleted (moved to comutilnative.cpp) |
src/coreclr/classlibnative/bcltype/CMakeLists.txt |
Deleted (files moved to vm) |
src/coreclr/classlibnative/CMakeLists.txt |
Deleted (subdirectories removed) |
src/coreclr/CMakeLists.txt |
Removed classlibnative include paths and subdirectory |
Member
|
@jkoritzinsky @AaronRobinsonMSFT I have been thinking about improving factoring of FCalls/QCalls, with the eventual goal of sharing them between NAOT and non-NAOT where possible. This is a small increment towards that. |
jkoritzinsky
approved these changes
Dec 30, 2025
This was referenced Jan 9, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
src/coreclr/classlibnativetosrc/coreclr/vm. There was very little code remaining under classlibnative.