Put the Crossgen2 assertion check in sync with actual intrinsic count #44624
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Recent removal of two intrinsics from the CorInfoIntrinsics enumeration started tripping the assertion failure verifying the expected number of intrinsics. I'm just updating the expected count. Thanks Tomas
trylek
added a commit
to trylek/runtime
that referenced
this pull request
Nov 13, 2020
|
Currently lab testing in combination with the CG2 SPC change: #44625 |
jkotas
reviewed
Nov 13, 2020
| @@ -112,7 +112,7 @@ static IntrinsicHashtable InitializeIntrinsicHashtable() | |||
| table.Add(CorInfoIntrinsics.CORINFO_INTRINSIC_GetRawHandle, "AllocatorOf", "System", "Activator"); | |||
|
|
|||
| // If this assert fails, make sure to add the new intrinsics to the table above and update the expected count below. | |||
| Debug.Assert((int)CorInfoIntrinsics.CORINFO_INTRINSIC_Count == 34, "Please update intrinsic hash table"); | |||
| Debug.Assert((int)CorInfoIntrinsics.CORINFO_INTRINSIC_Count == 32, "Please update intrinsic hash table"); | |||
There was a problem hiding this comment.
I think it would better to just delete this assert. It made sense when this was a separate project in CoreRT. It is not the case anymore.
There was a problem hiding this comment.
Good point, removed in 2nd commit.
ghost
locked as resolved and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Recent removal of two intrinsics from the CorInfoIntrinsics enumeration
started tripping the assertion failure verifying the expected number
of intrinsics. I'm just updating the expected count.
Thanks
Tomas
/cc @dotnet/crossgen-contrib