Skip to content

[cDAC] Ensure cDAC is used in test runs #117100

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
merged 8 commits into from
Jul 7, 2025
Merged

[cDAC] Ensure cDAC is used in test runs #117100

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e15440c
fix test run
max-charlamb Jun 27, 2025
fc1b028
add to PlatformManifestFileEntry
max-charlamb Jun 27, 2025
98ef4a3
typo
max-charlamb Jun 27, 2025
a42a414
Merge remote-tracking branch 'origin/main' into cdac-fail-fast
max-charlamb Jun 28, 2025
cd85e3e
fix bug in AMD64Unwinder
max-charlamb Jun 28, 2025
0f7a702
exactly match DAC behavior for initial context flags
max-charlamb Jun 28, 2025
e96076e
remove from sharedFramework and add to externals
max-charlamb Jul 7, 2025
ddb0094
properly release unused pClrDataAccess on failure
max-charlamb Jul 7, 2025
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
6 changes: 6 additions & 0 deletions src/coreclr/debug/daccess/daccess.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7046,6 +7046,12 @@ CLRDataCreateInstance(REFIID iid,
// Release the AddRef from the QI.
pClrDataAccess->Release();
}

if (cdacInterface == nullptr)
{
// If we requested to use the cDAC, but failed to create the cDAC interface, return failure
return E_FAIL;
}
}
}
#endif
Expand Down
3 changes: 3 additions & 0 deletions src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,9 @@
<PlatformManifestFileEntry Condition="'$(PgoInstrument)' != ''" Include="clrjit.pgd" IsNative="true" />
<PlatformManifestFileEntry Include="libclrjit.so" IsNative="true" />
<PlatformManifestFileEntry Include="libclrjit.dylib" IsNative="true" />
<PlatformManifestFileEntry Include="mscordaccore_universal.dll" IsNative="true" />
<PlatformManifestFileEntry Include="libmscordaccore_universal.so" IsNative="true" />
<PlatformManifestFileEntry Include="libmscordaccore_universal.dylib" IsNative="true" />
<PlatformManifestFileEntry Include="mscordaccore.dll" IsNative="true" />
<PlatformManifestFileEntry Include="libmscordaccore.so" IsNative="true" />
<PlatformManifestFileEntry Include="libmscordaccore.dylib" IsNative="true" />
Expand Down
3 changes: 1 addition & 2 deletions src/native/managed/cdac/mscordaccore_universal/mscordaccore_universal.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@
</ItemGroup>
<ItemGroup>
<InstallRuntimeComponentDestination Include="." />
<!-- TODO: [cdac] Output to sharedFramework and add PlatformManifestFileEntry for Microsoft.NETCore.App once ready to include in shipping package -->
<!-- <InstallRuntimeComponentDestination Include="sharedFramework" Condition="'$(RuntimeFlavor)' == 'coreclr'"/> -->
<InstallRuntimeComponentDestination Include="sharedFramework" Condition="'$(RuntimeFlavor)' == 'coreclr'"/>
</ItemGroup>

<ItemGroup>
Expand Down
Loading