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

Allow unsafe blocks in iterators #73046

Merged
merged 21 commits into from
May 2, 2024
Merged

Allow unsafe blocks in iterators #73046

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
badd0a9
Allow unsafe blocks in iterators
jjonescz Apr 16, 2024
a21bde7
Drop duplicate long diagnostic verifications
jjonescz Apr 18, 2024
47c3887
Use `nint` in tests to simplify
jjonescz Apr 18, 2024
ef59fea
Add more tests
jjonescz Apr 18, 2024
8fc5539
Handle more iterator kinds
jjonescz Apr 24, 2024
ce43691
Make unsafe affect only signature, not iterator body
jjonescz Apr 25, 2024
c1672a8
Fix comments
jjonescz Apr 25, 2024
739d04b
Rename method setting or clearing unsafe region
jjonescz Apr 26, 2024
a79647a
Improve code
jjonescz Apr 26, 2024
c5f7770
Fix accessors
jjonescz Apr 26, 2024
ce0140b
Remove asserts that can fail for invalid code
jjonescz Apr 26, 2024
c482508
Improve tests
jjonescz Apr 29, 2024
f848432
Avoid some langversion errors that would still be errors in newer lan…
jjonescz Apr 29, 2024
cb4f1f7
Refactor tests
jjonescz Apr 30, 2024
4817390
Document a breaking change
jjonescz Apr 30, 2024
d0977cb
Fix theory conditions
jjonescz Apr 30, 2024
14e508c
Test non-iterator unsafe contexts in older language versions as well
jjonescz Apr 30, 2024
81ef3aa
Fix tests demonstrating unsafe context in iterators in C# 12
jjonescz Apr 30, 2024
2fd98b5
Improve naming of tests verifying safe context of setters
jjonescz Apr 30, 2024
974722e
Clarify comment
jjonescz Apr 30, 2024
9c48d31
Fix test name
jjonescz May 2, 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
Prev Previous commit
Next Next commit
Clarify comment
  • Loading branch information
@jjonescz
jjonescz committed Apr 30, 2024
commit 974722ebfc91f75bc1a19e52f84a5a200215f662
5 changes: 3 additions & 2 deletions src/Compilers/CSharp/Portable/Binder/Binder_Flags.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,9 @@ internal Binder WithAdditionalFlagsAndContainingMemberOrLambda(BinderFlags flags
internal Binder SetOrClearUnsafeRegionIfNecessary(SyntaxTokenList modifiers, bool isIteratorBody = false)
{
// In C# 13 and above, iterator bodies define a safe context even when nested in an unsafe context.
Copy link
Member

@cston cston Apr 30, 2024 •
edited by jjonescz
Loading

Choose a reason for hiding this comment

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

In C# 13 and above,

Aren't iterator bodies defined in a safe context, regardless of language version? #Resolved

Copy link
Member Author

@jjonescz jjonescz Apr 30, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Directly in iterators it might appear so because using any unsafe constructs is an error anyway, but if we use local functions for example, it can be seen that in C# 12 iterators do not define safe context, for example:

unsafe class C // unsafe context
{
    System.Collections.Generic.IEnumerable<int> M() // iterator
    {
        yield return local();
        int local() => sizeof(nint); // allowed, we are in unsafe context
    }
}

This is a pre-existing spec violation.

// In C# 12 and below, we keep the behavior that nested iterator bodies (e.g., local functions)
// inherit the safe/unsafe context from their containing scope to avoid a breaking change.
// In C# 12 and below, we keep the (spec violating) behavior that iterator bodies inherit the safe/unsafe context
// from their containing scope. Since there are errors for unsafe constructs directly in iterators,
// this inherited unsafe context can be observed only in nested non-iterator local functions.
var withoutUnsafe = isIteratorBody && this.Compilation.IsFeatureEnabled(MessageID.IDS_FeatureRefUnsafeInIteratorAsync);

if (this.Flags.Includes(BinderFlags.UnsafeRegion))
Expand Down