Skip to content

Commit 25e2d7f

Browse files
max-charlambMax CharlambCopilot
authored
Use Checked runtime for cDAC dump tests (#126899)
> [!NOTE] > This PR was created with assistance from GitHub Copilot. Switch the cDAC dump test builds from Release to Checked runtime configuration (`-rc checked`) while keeping libs as Release (`-lc release`). This enables runtime asserts in the CLR, which helps catch issues in the cDAC data descriptors and contract implementations during dump testing. **Changes:** - Single-leg dump tests: `-rc release` → `-rc checked` - X-plat dump generation: `-rc release` → `-rc checked` - X-plat dump testing: `-rc release` → `-rc checked` SOS test stages are unchanged (remain Release). --------- Co-authored-by: Max Charlamb <maxcharlamb@microsoft.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent d51a70b commit 25e2d7f

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

eng/pipelines/runtime-diagnostics.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ extends:
213213
shouldContinueOnError: true
214214
jobParameters:
215215
nameSuffix: CdacDumpTest
216-
buildArgs: -s clr+libs+tools.cdac+tools.cdacdumptests -c $(_BuildConfig) -rc $(_BuildConfig) -lc $(_BuildConfig) /p:SkipDumpVersions=net10.0
216+
buildArgs: -s clr+libs+tools.cdac+tools.cdacdumptests -c $(_BuildConfig) -rc checked -lc $(_BuildConfig) /p:SkipDumpVersions=net10.0
217217
timeoutInMinutes: 180
218218
postBuildSteps:
219219
- template: /eng/pipelines/cdac/prepare-cdac-helix-steps.yml
@@ -257,7 +257,7 @@ extends:
257257
shouldContinueOnError: true
258258
jobParameters:
259259
nameSuffix: CdacXPlatDumpGen
260-
buildArgs: -s clr+libs+tools.cdac+tools.cdacdumptests -c $(_BuildConfig) -rc $(_BuildConfig) -lc $(_BuildConfig) /p:SkipDumpVersions=net10.0
260+
buildArgs: -s clr+libs+tools.cdac+tools.cdacdumptests -c $(_BuildConfig) -rc checked -lc $(_BuildConfig) /p:SkipDumpVersions=net10.0
261261
timeoutInMinutes: 180
262262
postBuildSteps:
263263
- template: /eng/pipelines/cdac/prepare-cdac-helix-steps.yml
@@ -304,7 +304,7 @@ extends:
304304
shouldContinueOnError: true
305305
jobParameters:
306306
nameSuffix: CdacXPlatDumpTest
307-
buildArgs: -s clr+libs+tools.cdac+tools.cdacdumptests -c $(_BuildConfig) -rc $(_BuildConfig) -lc $(_BuildConfig) /p:SkipDumpVersions=net10.0
307+
buildArgs: -s clr+libs+tools.cdac+tools.cdacdumptests -c $(_BuildConfig) -rc checked -lc $(_BuildConfig) /p:SkipDumpVersions=net10.0
308308
timeoutInMinutes: 180
309309
postBuildSteps:
310310
- template: /eng/pipelines/cdac/prepare-cdac-helix-steps.yml

src/coreclr/vm/datadescriptor/datadescriptor.inc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ CDAC_TYPE_FIELD(Thread, T_POINTER, DebuggerFilterContext, cdac_data<Thread>::Deb
4949
CDAC_TYPE_FIELD(Thread, T_POINTER, ProfilerFilterContext, cdac_data<Thread>::ProfilerFilterContext)
5050
#endif // PROFILING_SUPPORTED
5151
CDAC_TYPE_FIELD(Thread, TYPE(GCHandle), GCHandle, cdac_data<Thread>::ExposedObject)
52-
CDAC_TYPE_FIELD(Thread, TYPE(GCHandle), LastThrownObject, cdac_data<Thread>::LastThrownObject)
52+
CDAC_TYPE_FIELD(Thread, T_POINTER, LastThrownObject, cdac_data<Thread>::LastThrownObject)
5353
CDAC_TYPE_FIELD(Thread, T_POINTER, LinkNext, cdac_data<Thread>::Link)
5454
CDAC_TYPE_FIELD(Thread, T_POINTER, ThreadLocalDataPtr, cdac_data<Thread>::ThreadLocalDataPtr)
5555
#ifndef TARGET_UNIX
@@ -59,7 +59,7 @@ CDAC_TYPE_END(Thread)
5959

6060
CDAC_TYPE_BEGIN(ThreadStore)
6161
CDAC_TYPE_INDETERMINATE(ThreadStore)
62-
CDAC_TYPE_FIELD(ThreadStore, TYPE(SLink), FirstThreadLink, cdac_data<ThreadStore>::FirstThreadLink)
62+
CDAC_TYPE_FIELD(ThreadStore, T_POINTER, FirstThreadLink, cdac_data<ThreadStore>::FirstThreadLink)
6363
CDAC_TYPE_FIELD(ThreadStore, T_INT32, ThreadCount, cdac_data<ThreadStore>::ThreadCount)
6464
CDAC_TYPE_FIELD(ThreadStore, T_INT32, UnstartedCount, cdac_data<ThreadStore>::UnstartedCount)
6565
CDAC_TYPE_FIELD(ThreadStore, T_INT32, BackgroundCount, cdac_data<ThreadStore>::BackgroundCount)
@@ -173,7 +173,7 @@ CDAC_TYPE_END(String)
173173

174174
CDAC_TYPE_BEGIN(Array)
175175
CDAC_TYPE_SIZE(sizeof(ArrayBase))
176-
CDAC_TYPE_FIELD(Array, T_POINTER, m_NumComponents, cdac_data<ArrayBase>::m_NumComponents)
176+
CDAC_TYPE_FIELD(Array, T_UINT32, m_NumComponents, cdac_data<ArrayBase>::m_NumComponents)
177177
CDAC_TYPE_END(Array)
178178

179179
CDAC_TYPE_BEGIN(InteropSyncBlockInfo)

0 commit comments

Comments
 (0)