Skip to content
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

Jump to bottom

Fix condition in Debug.Assert in TarEntry.cs #100860

Merged
merged 3 commits into from
Jul 22, 2024
Merged

Fix condition in Debug.Assert in TarEntry.cs #100860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d8dd88
Fix condition in Debug.Assert
usr-sse2 Apr 10, 2024
608d133
Fix assert condition in UnconditionalSuppressMessageAttributeState.cs
usr-sse2 Apr 10, 2024
910a314
Merge branch 'main' into patch-1
stephentoub Jul 22, 2024
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/libraries/System.Formats.Tar/src/System/Formats/Tar/TarEntry.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ private Task ExtractToFileInternalAsync(string filePath, string? linkTargetPath,

private void CreateNonRegularFile(string filePath, string? linkTargetPath)
{
Debug.Assert(EntryType is not TarEntryType.RegularFile or TarEntryType.V7RegularFile or TarEntryType.ContiguousFile);
Debug.Assert(EntryType is not (TarEntryType.RegularFile or TarEntryType.V7RegularFile or TarEntryType.ContiguousFile));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: alternative fix is what we are using in number of places (including this file):

Suggested change
Debug.Assert(EntryType is not (TarEntryType.RegularFile or TarEntryType.V7RegularFile or TarEntryType.ContiguousFile));
Debug.Assert(EntryType is not TarEntryType.RegularFile and not TarEntryType.V7RegularFile or TarEntryType.ContiguousFile);


switch (EntryType)
{
Expand Down
2 changes: 1 addition & 1 deletion src/tools/illink/src/linker/Linker/UnconditionalSuppressMessageAttributeState.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ static bool TryDecodeSuppressMessageAttributeData (CustomAttribute attribute, ou

IEnumerable<Suppression> DecodeSuppressions (ICustomAttributeProvider provider)
{
Debug.Assert (provider is not ModuleDefinition or AssemblyDefinition);
Debug.Assert (provider is not (ModuleDefinition or AssemblyDefinition));

if (!_context.CustomAttributes.HasAny (provider))
yield break;
Expand Down
Loading