diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2022-05-10 17:17:08 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-10 17:17:08 +0000 |
commit | c1ff79996acfba45a50f181f9d3be1625cdef8f6 (patch) | |
tree | d99b71a754b5c9bc70d7a8ac6b7783f0f535d773 /gcc/rust/expand/rust-macro-expand.h | |
parent | 03c21a08eb40b71e67da0c8ae83ed2c645fb76a3 (diff) | |
parent | 2959ff8e7dd8b06bee76636af84c5aee06971397 (diff) | |
download | gcc-c1ff79996acfba45a50f181f9d3be1625cdef8f6.zip gcc-c1ff79996acfba45a50f181f9d3be1625cdef8f6.tar.gz gcc-c1ff79996acfba45a50f181f9d3be1625cdef8f6.tar.bz2 |
Merge #1242
1242: Remove undefined behavior in context vector r=CohenArthur a=CohenArthur
This also fixes the undefined behavior. Once again we are hurt by
`std::vector<T>::back()` returning references and not
pointers/`std::optional<T>`s!
The cause of the bug was some overzealous popping from the context
vector in block expressions. The amount of calls to `pop_context` is now
the same as the amount of calls to `push_context`
Closes #1233
Co-authored-by: Arthur Cohen <arthur.cohen@embecosm.com>
Diffstat (limited to 'gcc/rust/expand/rust-macro-expand.h')
-rw-r--r-- | gcc/rust/expand/rust-macro-expand.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gcc/rust/expand/rust-macro-expand.h b/gcc/rust/expand/rust-macro-expand.h index 3c53d8d..a582524 100644 --- a/gcc/rust/expand/rust-macro-expand.h +++ b/gcc/rust/expand/rust-macro-expand.h @@ -275,8 +275,11 @@ struct MacroExpander ContextType pop_context () { + rust_assert (!context.empty ()); + ContextType t = context.back (); context.pop_back (); + return t; } |