Changed From<String> for PassIdentifier to TryFrom for PassIdentifier

Also change From<&Options> to TryFrom<&Options>, since it also used passIdentifier

Signed-off-by: Tomas Fabrizio Orsi <[email protected]>

Author: lima-limon-inc

hir/src/pass/manager.rs

@@ -42,16 +42,21 @@ pub struct IRPrintingConfig {
     pub flags: OpPrintingFlags,
 }
 
-impl From<&Options> for IRPrintingConfig {
-    fn from(options: &Options) -> Self {
-        let pass_filters: Vec<PassIdentifier> =
-            options.print_ir_after_pass.iter().map(|a| a.into()).collect();
-        IRPrintingConfig {
+impl TryFrom<&Options> for IRPrintingConfig {
+    type Error = Report;
+
+    fn try_from(options: &Options) -> Result<Self, Self::Error> {
+        let pass_filters: Vec<PassIdentifier> = options
+            .print_ir_after_pass
+            .iter()
+            .map(|a| a.try_into())
+            .collect::<Result<Vec<PassIdentifier>, Report>>()?;
+        Ok(IRPrintingConfig {
             print_ir_after_all: options.print_ir_after_all,
             print_ir_after_pass: pass_filters,
             print_ir_after_modified: options.print_ir_after_modified,
             ..Default::default()
-        }
+        })
     }
 }
 

hir/src/pass/pass.rs

@@ -1,4 +1,4 @@
-use alloc::{boxed::Box, rc::Rc};
+use alloc::{boxed::Box, format, rc::Rc};
 use core::{any::Any, fmt};
 
 use super::*;
@@ -154,18 +154,20 @@ pub enum PassIdentifier {
     TransformSpills,
 }
 
-impl From<&String> for PassIdentifier {
-    fn from(pass_name: &String) -> Self {
+impl TryFrom<&String> for PassIdentifier {
+    type Error = Report;
+
+    fn try_from(pass_name: &String) -> Result<Self, Self::Error> {
         match pass_name.as_str() {
-            "canonicalizer" => PassIdentifier::Canonicalizer,
-            "control-flow-sink" => PassIdentifier::ControlFlowSink,
-            "lift-control-flow" => PassIdentifier::LiftControlFlowToSCF,
-            "sink-operand-defs" => PassIdentifier::SinkOperandDefs,
+            "canonicalizer" => Ok(PassIdentifier::Canonicalizer),
+            "control-flow-sink" => Ok(PassIdentifier::ControlFlowSink),
+            "lift-control-flow" => Ok(PassIdentifier::LiftControlFlowToSCF),
+            "sink-operand-defs" => Ok(PassIdentifier::SinkOperandDefs),
             "sparse-conditional-constant-propagation" => {
-                PassIdentifier::SparseConditionalConstantPropagation
+                Ok(PassIdentifier::SparseConditionalConstantPropagation)
             }
-            "transform-spills" => PassIdentifier::TransformSpills,
-            _ => panic!("ERROR: '{pass_name}' unrecognized pass."),
+            "transform-spills" => Ok(PassIdentifier::TransformSpills),
+            _ => Err(Report::msg(format!("'{pass_name}' unrecognized pass."))),
         }
     }
 }

midenc-compile/src/stages/rewrite.rs

@@ -22,7 +22,7 @@ impl Stage for ApplyRewritesStage {
     }
 
     fn run(&mut self, input: Self::Input, context: Rc<Context>) -> CompilerResult<Self::Output> {
-        let ir_print_config: IRPrintingConfig = (&context.as_ref().session().options).into();
+        let ir_print_config: IRPrintingConfig = (&context.as_ref().session().options).try_into()?;
         log::debug!(target: "driver", "applying rewrite passes");
         // TODO(pauls): Set up pass registration for new pass infra
         /*