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.

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

Revert "Fix source_file bug in mono_ppdb_lookup_location_internal" #97359

Merged
merged 1 commit into from
Jan 23, 2024

Conversation

thaystg
Copy link
Member

@thaystg thaystg commented Jan 23, 2024

Reverts #96497

@dotnet-issue-labeler dotnet-issue-labeler bot added the needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners label Jan 23, 2024
@ghost ghost assigned thaystg Jan 23, 2024
@vargaz
Copy link
Contributor

vargaz commented Jan 23, 2024

A possible fix would be:

		if (!first && delta_il == 0) {
			/* document-record */
			docidx = mono_metadata_decode_value (ptr, &ptr);
			// check the current iloffset to ensure that we do not update docname after the target
			// offset has been reached (the updated docname will be for the next sequence point)
			if (iloffset < offset)
				docname = get_docname (ppdb, image, docidx);
			continue;
		}

@vargaz
Copy link
Contributor

vargaz commented Jan 23, 2024

@bholmes

@thaystg
Copy link
Member Author

thaystg commented Jan 23, 2024

Do you think we should fix it for preview 1 or revert it for preview 1 and try this in main?

@vargaz
Copy link
Contributor

vargaz commented Jan 23, 2024

I'd suggest reverting it.

@thaystg
Copy link
Member Author

thaystg commented Jan 23, 2024

/backport to release/9.0-preview1

Copy link
Contributor

Started backporting to release/9.0-preview1: https://github.com/dotnet/runtime/actions/runs/7620042277

@ilonatommy ilonatommy merged commit 3ae99a7 into main Jan 23, 2024
108 of 111 checks passed
@bholmes
Copy link
Contributor

bholmes commented Jan 23, 2024

A possible fix would be:

Yes this looks correct

@thaystg
Copy link
Member Author

thaystg commented Jan 23, 2024

@bholmes can you please open another PR with @vargaz suggestion?

@jkotas jkotas deleted the revert-96497-unity-fix/issue-uum-4341 branch February 21, 2024 00:47
@github-actions github-actions bot locked and limited conversation to collaborators Mar 22, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants