EnC - Tell the debugger about updated type def tokens by davidwengier · Pull Request #53217 · dotnet/roslyn

davidwengier · 2021-05-06T05:49:09Z

src/Compilers/Core/Portable/Compilation/Compilation.cs

src/Compilers/Core/Portable/Emit/EditAndContinue/DeltaMetadataWriter.cs

tmat · 2021-05-08T16:53:55Z

public class EditAndContinueTests : EditAndContinueTestBase

Do we have tests that verify updated types for synthesized types? Local function/lambda's closures, state machines, the <Module> type, anonymous types, etc. Also a test with updated generic type.

Refers to: src/Compilers/CSharp/Test/Emit/Emit/EditAndContinue/EditAndContinueTests.cs:29 in d37f7cc. [](commit_id = d37f7cce7f3dbe1038c8f9a8991cc916dc008722, deletion_comment = False)

tmat · 2021-05-08T17:06:39Z

Let's target main. I don't think we need this in 16.1x. If we need to we can then back port. In general we shouldn't make changes to -vs-deps unless absolutely necessary since it just makes harder to work in main.

davidwengier · 2021-05-10T03:14:47Z

In general we shouldn't make changes to -vs-deps unless absolutely necessary

The debugger API that this needs isn't in main yet, which is why I targeted 16.10-vs-deps. I'm happy to not take this for 16.1x, but at the moment we still need to target main-vs-deps for the debugger contracts library.

tmat · 2021-05-10T16:35:15Z

The changes in the PR do not depend on the debugger API. Passing it to the debugger can only be done in -vs-deps, but all other changes can be in main.

_typeDefs is used to keep track of added type defs, but if we use it for updated type defs too then we start getting duplicate entries in the EnC log, but at the time that we output that log we can't tell which is the better entries to output. Easier to leave the EnC log alone, since it works, and just add something new to keep track of every update.

davidwengier · 2021-05-11T00:22:57Z

Okay, I've retargeted to main.

Do we have tests that verify updated types for synthesized types? Local function/lambda's closures, state machines, the <Module> type, anonymous types, etc. Also a test with updated generic type.

I've added verification to existing tests that cover those scenarios. Couldn't get <Module> working, looks like compiler changes would be needed to support that. Logged #53310

src/Features/Core/Portable/EditAndContinue/EditSession.cs

tmat

src/Compilers/CSharp/Test/Emit/Emit/EditAndContinue/EditAndContinueTests.cs

davidwengier · 2021-05-11T01:41:29Z

@dotnet/roslyn-compiler can I get a couple of reviews?

RikkiGibson · 2021-05-17T19:41:30Z

src/Compilers/Test/Core/Compilation/CompilationDifference.cs

+                EmitResult.UpdatedMethods.Select(methodHandle => $"0x{MetadataTokens.GetToken(methodHandle):X8}"));
+        }
+
+        public void VerifyUpdatedTypes(params string[] expecedTypeTokens)


nit: spelling

Thank you! Will fix, and merge

RikkiGibson · 2021-05-17T19:43:37Z

src/Compilers/VisualBasic/Portable/Emit/EditAndContinue/EmitHelpers.vb

            Dim serializationProperties = compilation.ConstructModuleSerializationProperties(emitOpts, runtimeMDVersion, baseline.ModuleVersionId)
            Dim manifestResources = SpecializedCollections.EmptyEnumerable(Of ResourceDescription)()

+            Dim updatedMethods = ArrayBuilder(Of MethodDefinitionHandle).GetInstance()


I was confused by this as these don't look used (aside from ToImmutableAndFree()). Is there more work coming later?

They're passed to SerializeToDeltaStreams on line 86. On the off chance this comment was meant for another location, there is another spot that probably has these arrays and there are changes coming in future, but the API is only in -vs-deps.

I think I failed to use one of the following correctly:

My eyes

My code review tool

😄

…vice-featureslayer * upstream/main: (857 commits) Update contrib documentation (dotnet#53504) SImplify Fix out of bound crash in lsp navto. Revert changes to TypeScriptWaitContext wrappers Switch to ROSLYN_TEST_CI for CI detection SImplify Simplify LoggerTestChannel using BlockingCollection Only require telemetry validation in CI Fix out of bound crash in lsp navto. Fix locked comment Update Compiler Test Plan.md (dotnet#53420) Adjust doc comment for NullableWalker.VisitConversion (dotnet#53429) Revert "Infer delegate types with -langversion:preview only (dotnet#53241)" (dotnet#53466) Fix syntax normalizer to add space around before colon in constructor initializer (dotnet#53326) Remove unnecessary property (dotnet#53406) EnC - Tell the debugger about updated type def tokens (dotnet#53217) Revert an error Update PublishData.json Keep trailing trivia so single line if statements don't get badly formatted (dotnet#53414) Fix dead test code (dotnet#53416) ...

davidwengier requested review from a team as code owners May 6, 2021 05:49

ghost added the Area-Compilers label May 6, 2021

davidwengier commented May 6, 2021

View reviewed changes

src/Compilers/Core/Portable/Compilation/Compilation.cs Outdated Show resolved Hide resolved

davidwengier requested a review from tmat May 6, 2021 05:57

tmat reviewed May 8, 2021

View reviewed changes

src/Compilers/Core/Portable/Compilation/Compilation.cs Outdated Show resolved Hide resolved

tmat reviewed May 8, 2021

View reviewed changes

src/Compilers/Core/Portable/Compilation/Compilation.cs Outdated Show resolved Hide resolved

tmat reviewed May 8, 2021

View reviewed changes

src/Compilers/Core/Portable/Emit/EditAndContinue/DeltaMetadataWriter.cs Outdated Show resolved Hide resolved

davidwengier changed the base branch from release/dev16.10-vs-deps to main May 10, 2021 02:58

davidwengier requested a review from a team as a code owner May 10, 2021 02:58

davidwengier force-pushed the EnCUpdatedTypeDefs branch from d37f7cc to f6337d4 Compare May 10, 2021 03:02

davidwengier changed the base branch from main to main-vs-deps May 10, 2021 03:15

davidwengier force-pushed the EnCUpdatedTypeDefs branch from f6337d4 to 050c8da Compare May 10, 2021 03:17

davidwengier added 9 commits May 11, 2021 07:02

Plumb updated types through everywhere

16a4b77

Tests

c3d2572

Whitespace

5026fda

Update Public API file

e97f9ee

FIx build warnings

a6fceb5

Rename methods

190ed41

Move updated types and members to EmitDifferenceResult

beb4d0f

Update tests to cover more scenarios

333cdbe

davidwengier force-pushed the EnCUpdatedTypeDefs branch from 050c8da to 333cdbe Compare May 11, 2021 00:12

davidwengier changed the base branch from main-vs-deps to main May 11, 2021 00:12

Remove old code

8a67cfb

tmat reviewed May 11, 2021

View reviewed changes

src/Features/Core/Portable/EditAndContinue/EditSession.cs Outdated Show resolved Hide resolved

tmat reviewed May 11, 2021

View reviewed changes

src/Features/Core/Portable/EditAndContinue/EditSession.cs Show resolved Hide resolved

tmat approved these changes May 11, 2021

View reviewed changes

tmat reviewed May 11, 2021

View reviewed changes

src/Compilers/CSharp/Test/Emit/Emit/EditAndContinue/EditAndContinueTests.cs Show resolved Hide resolved

davidwengier added 2 commits May 11, 2021 17:49

Clean up

ddabce1

Verify update types by name

8b5109f

cston approved these changes May 11, 2021

View reviewed changes

RikkiGibson self-assigned this May 12, 2021

This was referenced May 13, 2021

Attempt to load System.Runtime reference assembly for execution causes test failure #53391

Open

Flaky test 'InteractiveHostDesktopTests.StackOverflow' #46414

Open

RikkiGibson reviewed May 17, 2021

View reviewed changes

RikkiGibson approved these changes May 17, 2021

View reviewed changes

Spelling

1d8c8ba

davidwengier enabled auto-merge (squash) May 17, 2021 20:50

davidwengier merged commit c1d0a97 into dotnet:main May 17, 2021

ghost added this to the Next milestone May 17, 2021

davidwengier deleted the EnCUpdatedTypeDefs branch May 17, 2021 23:57

RikkiGibson modified the milestones: Next, 17.0.P2 Jun 29, 2021

Conversation

davidwengier commented May 6, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

tmat commented May 8, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

tmat commented May 8, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

davidwengier commented May 10, 2021

Uh oh!

tmat commented May 10, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

davidwengier commented May 11, 2021

Uh oh!

Uh oh!

Uh oh!

tmat left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

davidwengier commented May 11, 2021

Uh oh!

RikkiGibson May 17, 2021

Choose a reason for hiding this comment

Uh oh!

davidwengier May 17, 2021

Choose a reason for hiding this comment

Uh oh!

RikkiGibson May 17, 2021

Choose a reason for hiding this comment

Uh oh!

davidwengier May 17, 2021

Choose a reason for hiding this comment

Uh oh!

RikkiGibson May 17, 2021

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

davidwengier commented May 6, 2021 •

edited

Loading

tmat commented May 8, 2021 •

edited

Loading

tmat commented May 8, 2021 •

edited

Loading

tmat commented May 10, 2021 •

edited

Loading