T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix an assertion that wasn't doing what it said

Browse Source
This commit is contained in:
David Lattimore
2019-08-03 21:50:31 +10:00
committed by Benjamin Bouvier
parent bc1b56f739
commit 383ce584ae
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cranelift/codegen/meta/src/cdsl/recipes.rs
View File

@@ -102,7 +102,7 @@ impl Into<OperandConstraint> for Stack {
/// The `branch_range` argument must be provided for recipes that can encode /// The `branch_range` argument must be provided for recipes that can encode
/// branch instructions. It is an `(origin, bits)` tuple describing the exact /// branch instructions. It is an `(origin, bits)` tuple describing the exact
/// range that can be encoded in a branch instruction. /// range that can be encoded in a branch instruction.
#[derive(Clone, Hash)] #[derive(Clone)]
pub struct EncodingRecipe { pub struct EncodingRecipe {
/// Short mnemonic name for this recipe. /// Short mnemonic name for this recipe.
pub name: String, pub name: String,

13
cranelift/codegen/meta/src/isa/x86/encodings.rs
View File

@@ -21,7 +21,7 @@ pub struct PerCpuModeEncodings {
pub enc32: Vec<Encoding>, pub enc32: Vec<Encoding>,
pub enc64: Vec<Encoding>, pub enc64: Vec<Encoding>,
pub recipes: Recipes, pub recipes: Recipes,
recipes_inverse: HashMap<EncodingRecipe, EncodingRecipeNumber>, recipes_by_name: HashMap<String, EncodingRecipeNumber>,
pub inst_pred_reg: InstructionPredicateRegistry, pub inst_pred_reg: InstructionPredicateRegistry,
} }
@@ -31,15 +31,15 @@ impl PerCpuModeEncodings {
enc32: Vec::new(), enc32: Vec::new(),
enc64: Vec::new(), enc64: Vec::new(),
recipes: Recipes::new(), recipes: Recipes::new(),
recipes_inverse: HashMap::new(), recipes_by_name: HashMap::new(),
inst_pred_reg: InstructionPredicateRegistry::new(), inst_pred_reg: InstructionPredicateRegistry::new(),
} }
} }
fn add_recipe(&mut self, recipe: EncodingRecipe) -> EncodingRecipeNumber { fn add_recipe(&mut self, recipe: EncodingRecipe) -> EncodingRecipeNumber {
if let Some(found_index) = self.recipes_inverse.get(&recipe) { if let Some(found_index) = self.recipes_by_name.get(&recipe.name) {
assert!( assert!(
self.recipes[*found_index].name == recipe.name, self.recipes[*found_index] == recipe,
format!( format!(
"trying to insert different recipes with a same name ({})", "trying to insert different recipes with a same name ({})",
recipe.name recipe.name
@@ -47,8 +47,9 @@ impl PerCpuModeEncodings {
); );
*found_index *found_index
} else { } else {
let index = self.recipes.push(recipe.clone()); let recipe_name = recipe.name.clone();
self.recipes_inverse.insert(recipe, index); let index = self.recipes.push(recipe);
self.recipes_by_name.insert(recipe_name, index);
index index
} }
} }