Commit 828b5ea
Fix throwing operator new in ExecuTorch FileDataLoader (#20400)
Summary:
`et_aligned_alloc` in file_data_loader.cpp used the throwing form of
`::operator new(size, alignment)`, which throws `std::bad_alloc` on
allocation failure. The ExecuTorch runtime is built exception-free and
uses a `Result<>`/`Error` convention: `FileDataLoader::load` already
guards with `if (aligned_buffer == nullptr) return Error::MemoryAllocationFailed;`,
but that null-check was dead code because the throwing `operator new`
never returns null. On memory-constrained iOS devices, loading a large
model segment (e.g. SceneX V7) could throw, unwind with no landing pad,
and abort the process (SIGABRT) -- see the linked task.
Switch to the nothrow form `::operator new(size, alignment, std::nothrow)`
so the existing null-check fires and `load` returns
`Error::MemoryAllocationFailed`, which propagates cleanly through
`Program::LoadSegment` -> `Method::init` -> `-[ExecuTorchModule loadMethod:error:]`
and surfaces as a catchable NSError instead of aborting.
Also add a unit test that forces the segment allocation to fail (by
replacing the global nothrow aligned operator new for the test binary)
and asserts `load` returns `Error::MemoryAllocationFailed`.
Reviewed By: Gasoonjia
Differential Revision: D1090728121 parent 63b4c4d commit 828b5ea
2 files changed
Lines changed: 102 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
| 16 | + | |
16 | 17 | | |
17 | 18 | | |
18 | 19 | | |
| |||
44 | 45 | | |
45 | 46 | | |
46 | 47 | | |
47 | | - | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
48 | 54 | | |
49 | 55 | | |
50 | 56 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
| 11 | + | |
11 | 12 | | |
| 13 | + | |
12 | 14 | | |
13 | 15 | | |
14 | 16 | | |
15 | 17 | | |
16 | 18 | | |
| 19 | + | |
17 | 20 | | |
18 | 21 | | |
19 | 22 | | |
| |||
25 | 28 | | |
26 | 29 | | |
27 | 30 | | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
28 | 83 | | |
29 | 84 | | |
30 | 85 | | |
| |||
147 | 202 | | |
148 | 203 | | |
149 | 204 | | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
150 | 245 | | |
151 | 246 | | |
152 | 247 | | |
| |||
0 commit comments