fix static mut dealloc or freeze
#121
Merged
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
bjorn3
requested changes
Feb 7, 2017
src/error.rs
Outdated
| @@ -118,9 +118,9 @@ impl<'tcx> Error for EvalError<'tcx> { | |||
| "cannot evaluate inline assembly", | |||
| EvalError::TypeNotPrimitive(_) => | |||
| "expected primitive type, got nonprimitive", | |||
| EvalError::ReallocatedFrozenMemory => | |||
| EvalError::ReallocatedStaticMemory => | |||
| "tried to reallocate frozen memory", | |||
src/memory.rs
Outdated
| @@ -38,9 +38,19 @@ pub struct Allocation { | |||
| /// The alignment of the allocation to detect unaligned reads. | |||
| pub align: u64, | |||
| /// Whether the allocation may be modified. | |||
| /// Use the `freeze` method of `Memory` to ensure that an error occurs, if the memory of this | |||
| /// Use the `mark_static` method of `Memory` to ensure that an error occurs, if the memory of this | |||
| /// allocation is modified in the future. | |||
There was a problem hiding this comment.
"(modified) or deallocated"?
Statics are no longer immutable.
src/memory.rs
Outdated
| let immutable = if alloc.immutable { " (immutable)" } else { "" }; | ||
| let immutable = match alloc.static_kind { | ||
| StaticKind::Mutable => "(static mut)", | ||
| StaticKind::Immutable => "(immutable)", |
There was a problem hiding this comment.
I like immutable, it could be a vtable or static or constant or promoted.
There was a problem hiding this comment.
maybe use global mutable and global immutable
There was a problem hiding this comment.
too long imo. Also, it's just the trace debug messages ;)
There was a problem hiding this comment.
These strings should start with spaces like the original.
erickt
pushed a commit
to erickt/miri
that referenced
this pull request
Feb 4, 2022
Test from Rust 1.32 and update rand & quickcheck
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.
fixes #90
fixes #118
fixes #120