Skip to content

Revert "Merge pull request #57132 from CyrusNajmabadi/branchId3"#58856

Merged
CyrusNajmabadi merged 1 commit intodotnet:release/dev17.1from
CyrusNajmabadi:revertBranchIdBackport
Jan 20, 2022
Merged

Revert "Merge pull request #57132 from CyrusNajmabadi/branchId3"#58856
CyrusNajmabadi merged 1 commit intodotnet:release/dev17.1from
CyrusNajmabadi:revertBranchIdBackport

Conversation

@CyrusNajmabadi
Copy link
Copy Markdown
Contributor

This reverts commit 83a728a, reversing
changes made to a4ec465.

@CyrusNajmabadi CyrusNajmabadi requested a review from a team as a code owner January 14, 2022 03:01
@ghost ghost added the Area-IDE label Jan 14, 2022
@CyrusNajmabadi CyrusNajmabadi changed the base branch from main to release/dev17.1 January 14, 2022 03:01
Copy link
Copy Markdown
Member

@jasonmalinowski jasonmalinowski left a comment

Choose a reason for hiding this comment

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

Approving in that this appears to be a clean revert of the original PR (minus the small tweaks needed for adding the _workspace field back).

Comment on lines +51 to +60
/// <summary>
/// Cached compile time solution corresponding to the <see cref="Workspace.PrimaryBranchId"/>
/// </summary>
private (int DesignTimeSolutionVersion, BranchId DesignTimeSolutionBranch, Solution CompileTimeSolution)? _primaryBranchCompileTimeCache;

/// <summary>
/// Cached compile time solution for a forked branch. This is used primarily by LSP cases where
/// we fork the workspace solution and request diagnostics for the forked solution.
/// </summary>
private (int DesignTimeSolutionVersion, BranchId DesignTimeSolutionBranch, Solution CompileTimeSolution)? _forkedBranchCompileTimeCache;
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@tmat any concern with bringing this back? I don't know if anything more recently depended upon the simpler code in some way.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I am not aware of anything. Why do we need to revert this?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Because it caused a big regression of allocation in OOP
https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1426911

@CyrusNajmabadi CyrusNajmabadi merged commit 30573e1 into dotnet:release/dev17.1 Jan 20, 2022
@CyrusNajmabadi CyrusNajmabadi deleted the revertBranchIdBackport branch January 20, 2022 00:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants