Merge #599

bors[bot] · philberty · web-flow · commit 9526e6d62167 · 2021-07-27T12:23:09.000Z
599: Fix assertion for trait item mappings r=philberty a=philberty

These assertions defend against duplicate/bad mappings

Co-authored-by: Philip Herron &lt;philip.herron@embecosm.com&gt;
diff --git a/gcc/rust/util/rust-hir-map.cc b/gcc/rust/util/rust-hir-map.cc
@@ -263,7 +263,7 @@ void
 Mappings::insert_hir_trait_item (CrateNum crateNum, HirId id,
 				 HIR::TraitItem *item)
 {
-  rust_assert (lookup_hir_item (crateNum, id) == nullptr);
+  rust_assert (lookup_hir_trait_item (crateNum, id) == nullptr);
 
   hirTraitItemMappings[crateNum][id] = item;
   nodeIdToHirMappings[crateNum][item->get_mappings ().get_nodeid ()] = id;

Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,7 @@ void`
`263`	`263`	`Mappings::insert_hir_trait_item (CrateNum crateNum, HirId id,`
`264`	`264`	`HIR::TraitItem *item)`
`265`	`265`	`{`
`266`		`- rust_assert (lookup_hir_item (crateNum, id) == nullptr);`
	`266`	`+ rust_assert (lookup_hir_trait_item (crateNum, id) == nullptr);`
`267`	`267`
`268`	`268`	`hirTraitItemMappings[crateNum][id] = item;`
`269`	`269`	`nodeIdToHirMappings[crateNum][item->get_mappings ().get_nodeid ()] = id;`