Allow multiple documents in method debug info #66359
Conversation
| // we never expect to bind a file type in a context where the BuckStopsHereBinder lacks an AssociatedFileIdentifier | ||
| return lastBinder.AssociatedFileIdentifier.Value; | ||
| // BuckStopsHereBinder.AssociatedFileIdentifier may be null from the EE. | ||
| return lastBinder.AssociatedFileIdentifier.GetValueOrDefault(); |
There was a problem hiding this comment.
I guess if the file identifier we get for this binder chain is default, we simply return false from IsInScopeOfAssociatedSyntaxTree?
There was a problem hiding this comment.
Consider asserting lastBinder.AssociatedFileIdentifier.HasValue || (this.Flags & BinderFlags.InEEMethodBinder) != 0.
There was a problem hiding this comment.
I guess if the file identifier we get for this binder chain is default, we simply return false from
IsInScopeOfAssociatedSyntaxTree?
Correct.
Consider asserting
lastBinder.AssociatedFileIdentifier.HasValue || (this.Flags & BinderFlags.InEEMethodBinder) != 0.
Sounds good. I'll add that in a subsequent PR unless other changes are needed here.
|
Updated PR to avoid changing the compiler code. @RikkiGibson, @jcouv, @jaredpar, please take another look, thanks. |
MSRC fix. According to the mail, we should update to 16.5.28. The feature branch is based on dotnet#66423 The last checked in bug fix is dotnet#66359 Since QB doesn't want to approve dotnet#66398 now. I feel we shouldn't wait for that change to merge
The EE uses the document name from the method debug info in the PDB to recognize file-local types, and the EE was assuming the method debug info contained a single document in all cases, otherwise the debug info was ignored. For methods with sequence points from multiple documents (for example, a constructor for a type with a field initializer in a separate partial class), this resulted in no local scopes in the EE within those methods.
For portable PDBs, if the method has sequence points from multiple documents, no document is included in the method debug info. The fix is to skip reading the document in that case.
For Windows PDBs, reading the document info when there are multiple documents is not possible currently (see #66260), so documents are ignored from Windows PDBs, and as a result, file-local types are not available from the EE when debugging with a Windows PDB.
Fixes #66109
VSO bug #1713184