nordic-dev.net/rust-gpu
2
0
Fork 0
mirror of https://github.com/EmbarkStudios/rust-gpu.git synced 2024-11-22 06:45:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix None unwrap panic in mem2reg

Browse Source
This commit is contained in:
khyperia 2020-10-19 12:16:20 +02:00
parent 3f91e0707f
commit 919b320d32
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
rustc_codegen_spirv/src/linker/inline.rs
View File

@ -170,6 +170,21 @@ impl Inliner<'_, '_> {
inst_id inst_id
} }
fn undef_for(&mut self, ty: Word) -> Word {
// TODO: This is horribly slow, fix this
let existing = self
.types_global_values
.iter()
.find(|inst| inst.class.opcode == Op::Undef && inst.result_type.unwrap() == ty);
if let Some(existing) = existing {
return existing.result_id.unwrap();
}
let inst_id = self.id();
self.types_global_values
.push(Instruction::new(Op::Undef, Some(ty), Some(inst_id), vec![]));
inst_id
}
fn inline_fn(&mut self, function: &mut Function) { fn inline_fn(&mut self, function: &mut Function) {
let mut block_idx = 0; let mut block_idx = 0;
while block_idx < function.blocks.len() { while block_idx < function.blocks.len() {
@ -252,6 +267,7 @@ impl Inliner<'_, '_> {
&mut caller.blocks[0], &mut caller.blocks[0],
self.ptr_ty(call_result_type), self.ptr_ty(call_result_type),
return_variable.unwrap(), return_variable.unwrap(),
self.undef_for(call_result_type),
); );
} }
@ -344,7 +360,7 @@ fn get_inlined_blocks(
blocks blocks
} }
fn insert_opvariable(block: &mut Block, ptr_ty: Word, result_id: Word) { fn insert_opvariable(block: &mut Block, ptr_ty: Word, result_id: Word, undef_value: Word) {
let index = block let index = block
.instructions .instructions
.iter() .iter()
@ -360,7 +376,11 @@ fn insert_opvariable(block: &mut Block, ptr_ty: Word, result_id: Word) {
Op::Variable, Op::Variable,
Some(ptr_ty), Some(ptr_ty),
Some(result_id), Some(result_id),
vec![Operand::StorageClass(StorageClass::Function)], vec![
Operand::StorageClass(StorageClass::Function),
// See comment in `builder_methods.rs` `alloca` for why this undef is here.
Operand::IdRef(undef_value),
],
); );
match index { match index {
Some(index) => block.instructions.insert(index, inst), Some(index) => block.instructions.insert(index, inst),