Skip to content

Various fixes to get -dynamiccodecompiled false to build on windows #126329

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
BrzVlad merged 4 commits into from
Mar 31, 2026
Merged

Various fixes to get -dynamiccodecompiled false to build on windows #126329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b68dfdc
Fix FEATURE_RESOLVE_HELPER_DISPATCH definition
BrzVlad Mar 30, 2026
44feec6
Fix CallCountingStubCode stub
BrzVlad Mar 30, 2026
8c4be88
Fix clr interpreter static build on windows
BrzVlad Mar 30, 2026
43d32de
Fix adding of null NativeCodeVersion
BrzVlad Mar 30, 2026
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
2 changes: 1 addition & 1 deletion src/coreclr/inc/switches.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@

// Dispatch interface calls via resolve helper followed by an indirect call.
// Slow functional implementation, only used for stress-testing of DOTNET_JitForceControlFlowGuard=1.
#if defined(TARGET_WINDOWS) && (defined(TARGET_AMD64) || defined(TARGET_ARM64))
#if defined(FEATURE_VIRTUAL_STUB_DISPATCH) && defined(TARGET_WINDOWS) && (defined(TARGET_AMD64) || defined(TARGET_ARM64))
#define FEATURE_RESOLVE_HELPER_DISPATCH
#endif

Expand Down
8 changes: 4 additions & 4 deletions src/coreclr/interpreter/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ if(CLR_CMAKE_HOST_WIN32)
${STATIC_MT_CRT_LIB}
${STATIC_MT_VCRT_LIB}
)
list(APPEND INTERPRETER_SOURCES
Native.rc
)
# Native.rc is added only to the shared library, not to the statically linked one,
# to prevent VERSION duplicates
set(INTERPRETER_RESOURCES Native.rc)
add_definitions(-DFX_VER_INTERNALNAME_STR=clrinterpreter.dll)
endif()

Expand All @@ -52,7 +52,7 @@ if (NOT CMAKE_GENERATOR MATCHES "Visual Studio")
endif()

if (NOT CLR_CMAKE_TARGET_ARCH_WASM)
add_library_clr(clrinterpreter SHARED $<TARGET_OBJECTS:clrinterpreter_objects> $<TARGET_OBJECTS:dn-containers>)
add_library_clr(clrinterpreter SHARED $<TARGET_OBJECTS:clrinterpreter_objects> $<TARGET_OBJECTS:dn-containers> ${INTERPRETER_RESOURCES})
else()
add_library_clr(clrinterpreter STATIC $<TARGET_OBJECTS:clrinterpreter_objects> $<TARGET_OBJECTS:dn-containers>)
endif()
Expand Down
2 changes: 2 additions & 0 deletions src/coreclr/vm/amd64/thunktemplates.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ LEAF_ENTRY FixupPrecodeCode, _TEXT
jmp QWORD PTR [DATA_SLOT(FixupPrecode, PrecodeFixupThunk)]
LEAF_END_MARKED FixupPrecodeCode, _TEXT

ifdef FEATURE_TIERED_COMPILATION
LEAF_ENTRY CallCountingStubCode, _TEXT
mov rax,QWORD PTR [DATA_SLOT(CallCountingStub, RemainingCallCountCell)]
dec WORD PTR [rax]
Expand All @@ -30,5 +31,6 @@ LEAF_ENTRY CallCountingStubCode, _TEXT
CountReachedZero:
jmp QWORD PTR [DATA_SLOT(CallCountingStub, TargetForThresholdReached)]
LEAF_END_MARKED CallCountingStubCode, _TEXT
endif ; FEATURE_TIERED_COMPILATION

end
2 changes: 1 addition & 1 deletion src/coreclr/vm/threadsuspend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2648,7 +2648,7 @@ void __stdcall Thread::RedirectedHandledJITCase(RedirectReason reason)
if (Thread::UseRedirectForGcStress() && (reason == RedirectReason_GCStress))
{
_ASSERTE(pThread->PreemptiveGCDisabledOther());
DoGcStress(frame.GetContext(), NULL);
DoGcStress(frame.GetContext(), NativeCodeVersion());
}
else
#endif // HAVE_GCCOVER && USE_REDIRECT_FOR_GCSTRESS
Expand Down
Loading