refactor

Author: molikto

crates/rustc_codegen_spirv/src/linker/inline_globals.rs

@@ -80,12 +80,19 @@ enum FunctionArg {
 pub fn inline_global_varaibles(sess: &Session, module: &mut Module) -> super::Result<()> {
     let mut i = 0;
     let mut cont = true;
+    let mut has_run = false;
     //std::fs::write("res0.txt", module.disassemble());
     while cont {
         cont = inline_global_varaibles_rec(sess, module)?;
+        has_run = has_run || cont;
         i += 1;
         //std::fs::write(format!("res{}.txt", i), module.disassemble());
     }
+    // needed because inline global create duplicate types...
+    if has_run {
+        let _timer = sess.timer("link_remove_duplicate_types_round_2");
+        super::duplicates::remove_duplicate_types(&mut module);
+    }
     Ok(())
 }
 
@@ -172,13 +179,15 @@ fn inline_global_varaibles_rec(sess: &Session, module: &mut Module) -> super::Re
             }
         }
     }
+    // retain ones can rewrite
     function_args.retain(|_, k| match k {
         FunctionArg::Invalid => false,
         FunctionArg::Insts(v) => !v.is_empty(),
     });
     if function_args.is_empty() {
         return Ok(false);
     }
+    // start rewrite
     for function in &mut module.functions {
         let def = function.def.as_mut().unwrap();
         let fid = def.result_id.unwrap();

crates/rustc_codegen_spirv/src/linker/mod.rs

@@ -230,12 +230,6 @@ pub fn link(sess: &Session, mut inputs: Vec<Module>, opts: &Options) -> Result<L
         inline_globals::inline_global_varaibles(sess, &mut output)?;
     }
 
-    // needed because inline global create duplicate types...
-    {
-        let _timer = sess.timer("link_remove_duplicate_types_round_2");
-        duplicates::remove_duplicate_types(&mut output);
-    }
-
     {
         let _timer = sess.timer("link_inline");
         inline::inline(sess, &mut output)?;