[Merged by Bors] - Ensure Query does not use the wrong World
#7150
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
BoxyUwU
added
A-ECS
mockersf
reviewed
Jan 10, 2023
| let mut world1 = World::new(); | ||
| let world2 = World::new(); | ||
| let qstate = world1.query::<()>(); | ||
| // SAFETY: doesnt access anything |
There was a problem hiding this comment.
❤️ the safety comment in a test on a line that should panic
mockersf
approved these changes
Jan 10, 2023
tim-blackbird
approved these changes
Jan 10, 2023
BoxyUwU
added
the
S-Ready-For-Final-Review
james7132
approved these changes
Jan 10, 2023
bors bot
pushed a commit
that referenced
this pull request
Jan 10, 2023
`Query` relies on the `World` it stores being the same as the world used for creating the `QueryState` it stores. If they are not the same then everything is very unsound. This was not actually being checked anywhere, `Query::new` did not have a safety invariant or even an assertion that the `WorldId`'s are the same. This shouldn't have any user facing impact unless we have really messed up in bevy and have unsoundness elsewhere (in which case we would now get a panic instead of being unsound).
|
Build failed (retrying...): |
bors bot
pushed a commit
that referenced
this pull request
Jan 10, 2023
`Query` relies on the `World` it stores being the same as the world used for creating the `QueryState` it stores. If they are not the same then everything is very unsound. This was not actually being checked anywhere, `Query::new` did not have a safety invariant or even an assertion that the `WorldId`'s are the same. This shouldn't have any user facing impact unless we have really messed up in bevy and have unsoundness elsewhere (in which case we would now get a panic instead of being unsound).
|
Build failed (retrying...): |
|
bors is bad so i guess I will just close this and wait until my other PR lands??? |
bors bot
pushed a commit
that referenced
this pull request
Jan 10, 2023
`Query` relies on the `World` it stores being the same as the world used for creating the `QueryState` it stores. If they are not the same then everything is very unsound. This was not actually being checked anywhere, `Query::new` did not have a safety invariant or even an assertion that the `WorldId`'s are the same. This shouldn't have any user facing impact unless we have really messed up in bevy and have unsoundness elsewhere (in which case we would now get a panic instead of being unsound).
|
nvm apparently bors will just retry a bunch and then try to merge with something else? |
|
Pull request successfully merged into main. Build succeeded:
|
bors
bot
changed the title
Query does not use the wrong WorldQuery does not use the wrong World
alradish
pushed a commit
to alradish/bevy
that referenced
this pull request
Jan 22, 2023
`Query` relies on the `World` it stores being the same as the world used for creating the `QueryState` it stores. If they are not the same then everything is very unsound. This was not actually being checked anywhere, `Query::new` did not have a safety invariant or even an assertion that the `WorldId`'s are the same. This shouldn't have any user facing impact unless we have really messed up in bevy and have unsoundness elsewhere (in which case we would now get a panic instead of being unsound).
ItsDoot
pushed a commit
to ItsDoot/bevy
that referenced
this pull request
Feb 1, 2023
`Query` relies on the `World` it stores being the same as the world used for creating the `QueryState` it stores. If they are not the same then everything is very unsound. This was not actually being checked anywhere, `Query::new` did not have a safety invariant or even an assertion that the `WorldId`'s are the same. This shouldn't have any user facing impact unless we have really messed up in bevy and have unsoundness elsewhere (in which case we would now get a panic instead of being unsound).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Queryrelies on theWorldit stores being the same as the world used for creating theQueryStateit stores. If they are not the same then everything is very unsound. This was not actually being checked anywhere,Query::newdid not have a safety invariant or even an assertion that theWorldId's are the same.This shouldn't have any user facing impact unless we have really messed up in bevy and have unsoundness elsewhere (in which case we would now get a panic instead of being unsound).