Browse Source
Merge pull request #1571 from cfallin/fix-aarch64-heap-oob
Fix aarch64 load trap info: HeapOutOfBounds, not OutOfBounds.
pull/1581/head
Chris Fallin
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
2 additions and
2 deletions
-
cranelift/codegen/src/isa/aarch64/inst/emit.rs
|
|
|
@ -607,7 +607,7 @@ impl<O: MachSectionOutput> MachInstEmit<O> for Inst { |
|
|
|
|
|
|
|
if let Some(srcloc) = srcloc { |
|
|
|
// Register the offset at which the actual load instruction starts.
|
|
|
|
sink.add_trap(srcloc, TrapCode::OutOfBounds); |
|
|
|
sink.add_trap(srcloc, TrapCode::HeapOutOfBounds); |
|
|
|
} |
|
|
|
|
|
|
|
match &mem { |
|
|
|
@ -741,7 +741,7 @@ impl<O: MachSectionOutput> MachInstEmit<O> for Inst { |
|
|
|
|
|
|
|
if let Some(srcloc) = srcloc { |
|
|
|
// Register the offset at which the actual load instruction starts.
|
|
|
|
sink.add_trap(srcloc, TrapCode::OutOfBounds); |
|
|
|
sink.add_trap(srcloc, TrapCode::HeapOutOfBounds); |
|
|
|
} |
|
|
|
|
|
|
|
match &mem { |
|
|
|
|
