Commit 5e7d9da
authored
Check if an object is in our heap before using VM map during counting live bytes (#1289)
This PR fixes a bug in `increase_live_bytes`. If an object in the VM
space is scanned, the method will be called with an object reference
into the VM space, which may not be in our heap range. Then we get a
space descriptor from the VM map, and we will see panics in the
following code.
https://github.com/mmtk/mmtk-core/blob/129362d4f39a1191562d276c42f5b03e52aa287a/src/util/heap/layout/map64.rs#L209
https://github.com/mmtk/mmtk-core/blob/129362d4f39a1191562d276c42f5b03e52aa287a/src/util/heap/layout/map32.rs#L258
This PR works around the problem by checking if the object is in our
heap range first.1 parent ce0ba41 commit 5e7d9da
4 files changed
+22
-12
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
71 | 71 | | |
72 | 72 | | |
73 | 73 | | |
74 | | - | |
75 | | - | |
76 | | - | |
77 | | - | |
78 | | - | |
79 | | - | |
80 | | - | |
81 | | - | |
82 | | - | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
83 | 85 | | |
84 | 86 | | |
85 | 87 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
81 | 81 | | |
82 | 82 | | |
83 | 83 | | |
| 84 | + | |
| 85 | + | |
84 | 86 | | |
85 | 87 | | |
86 | 88 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
255 | 255 | | |
256 | 256 | | |
257 | 257 | | |
258 | | - | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
259 | 262 | | |
260 | 263 | | |
261 | 264 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
206 | 206 | | |
207 | 207 | | |
208 | 208 | | |
209 | | - | |
210 | | - | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
211 | 214 | | |
212 | 215 | | |
213 | 216 | | |
| |||
0 commit comments