aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Herron <philip.herron@embecosm.com>2022-07-08 14:54:37 +0100
committerPhilip Herron <philip.herron@embecosm.com>2022-07-15 11:58:23 +0100
commit81c4b6989f044a45455717b752cafb96f04b768e (patch)
tree84ef2eda81057f81cd87997d779d7209059e6fe4
parentf51284b598863eb0cbeb2984fd1499a672f2191d (diff)
downloadgcc-81c4b6989f044a45455717b752cafb96f04b768e.zip
gcc-81c4b6989f044a45455717b752cafb96f04b768e.tar.gz
gcc-81c4b6989f044a45455717b752cafb96f04b768e.tar.bz2
Fix undefined behaviour using .get on unique_ptr
As the move semantics for AST and HIR crates are unsafe on older compilers we are working around this by storing the pointer into the mappings class this was using the get method to store the pointer. The issue for loading extern crates the unique_ptr goes out of scope and this the deletion code resulting in undefined behaviour. This changes it to call release to take full ownership of the pointer as we expect.
-rw-r--r--gcc/rust/util/rust-hir-map.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/rust/util/rust-hir-map.cc b/gcc/rust/util/rust-hir-map.cc
index 353b7cb..360dabf 100644
--- a/gcc/rust/util/rust-hir-map.cc
+++ b/gcc/rust/util/rust-hir-map.cc
@@ -199,7 +199,7 @@ Mappings::insert_ast_crate (std::unique_ptr<AST::Crate> &&crate,
rust_assert (it == ast_crate_mappings.end ());
// store it
- ast_crate_mappings.insert ({crate_num, crate.get ()});
+ ast_crate_mappings.insert ({crate_num, crate.release ()});
// return the reference to it
it = ast_crate_mappings.find (crate_num);
@@ -236,7 +236,7 @@ Mappings::insert_hir_crate (std::unique_ptr<HIR::Crate> &&crate)
insert_node_to_hir (crate->get_mappings ().get_nodeid (),
crate->get_mappings ().get_hirid ());
- hir_crate_mappings.insert ({crateNum, crate.get ()});
+ hir_crate_mappings.insert ({crateNum, crate.release ()});
it = hir_crate_mappings.find (crateNum);
rust_assert (it != hir_crate_mappings.end ());