fix: runtime type errors found by Sorbet

Author: dhower-qc

lib/arch_obj_models/csr.rb

@@ -475,14 +475,14 @@ def sw_read_ast(symtab)
       return_type: Idl::Type.new(:bits, width: 128), # big int to hold special return values
       name: "CSR[#{name}].sw_read()",
       input_file: __source,
-      input_line: source_line("sw_read()"),
+      input_line: source_line(["sw_read()"]),
       symtab:,
       type_check: false
     )
 
     raise "unexpected #{@sw_read_ast.class}" unless @sw_read_ast.is_a?(Idl::FunctionBodyAst)
 
-    @sw_read_ast.set_input_file_unless_already_set(__source, source_line("sw_read()"))
+    @sw_read_ast.set_input_file_unless_already_set(__source, source_line(["sw_read()"]))
 
     @sw_read_ast
   end

lib/arch_obj_models/csr_field.rb

@@ -43,8 +43,9 @@ def initialize(parent_csr, field_name, field_data)
   def __source = @parent.__source
 
   # CSR field data starts at fields: NAME: with the YAML
-  def source_line(*path)
-    T.unsafe(self).super("fields", name, *path)
+  sig { params(path: T::Array[String]).returns(Integer) }
+  def source_line(path)
+    super(["fields", name].concat(path))
   end
 
   # For a full config, whether or not the field is implemented
@@ -104,7 +105,7 @@ def type_ast
       idl_code,
       name: "CSR[#{csr.name}].#{name}.type()",
       input_file: csr.__source,
-      input_line: csr.source_line("fields", name, "type()"),
+      input_line: csr.source_line(["fields", name, "type()"]),
       symtab: @cfg_arch.symtab,
       type_check: false
     )
@@ -346,7 +347,7 @@ def reset_value_ast
       return_type: Idl::Type.new(:bits, width: max_width),
       name: "CSR[#{parent.name}].#{name}.reset_value()",
       input_file: csr.__source,
-      input_line: csr.source_line("fields", name, "reset_value()"),
+      input_line: csr.source_line(["fields", name, "reset_value()"]),
       symtab: cfg_arch.symtab,
       type_check: false
     )
@@ -497,7 +498,7 @@ def sw_write_ast(symtab)
       return_type: Idl::Type.new(:bits, width: 128), # big int to hold special return values
       name: "CSR[#{csr.name}].#{name}.sw_write(csr_value)",
       input_file: csr.__source,
-      input_line: csr.source_line("fields", name, "sw_write(csr_value)"),
+      input_line: csr.source_line(["fields", name, "sw_write(csr_value)"]),
       symtab:,
       type_check: false
     )
@@ -822,6 +823,6 @@ def location_pretty(effective_xlen = nil)
   # @return [String] Long description of the field type
   sig { params(effective_xlen: T.nilable(Integer)).returns(String) }
   def type_desc(effective_xlen=nil)
-    TYPE_DESC_MAP[type(effective_xlen)]
+    TYPE_DESC_MAP.fetch(type(effective_xlen), "")
   end
 end

lib/arch_obj_models/database_obj.rb

@@ -123,7 +123,14 @@ class ValidationError < ::StandardError
   # @return [ConfiguredArchitecture] If a specification and config is known
   # @return [nil] Otherwise
   sig { returns(ConfiguredArchitecture) }
-  attr_reader :cfg_arch   # Use when extra stuff provided by ConfiguredArchitecture is required
+  def cfg_arch
+    raise "no cfg_arch" if @cfg_arch.nil?
+
+    @cfg_arch
+  end
+
+  sig { returns(T::Boolean) }
+  def cfg_arch? = !@cfg_arch.nil?
 
   sig { returns(String) }
   def kind = @data["kind"]
@@ -249,7 +256,7 @@ def description(
             symtab: @cfg_arch.symtab,
             name: "#{name}.description[#{idx}].when",
             input_file: __source,
-            input_line: source_line("description", idx, "when()")
+            input_line: source_line(["description", idx, "when()"])
           )
 
           symtab = @cfg_arch.symtab.global_clone
@@ -362,8 +369,8 @@ def primary_defined_by
   #   06: YAML
   #   misa_csr.source_line("sw_read()")  #=> 2
   #   mis_csr.source_line("fields", "A", "type()") #=> 5
-  sig { params(path: String).returns(Integer) }
-  def source_line(*path)
+  sig { params(path: T::Array[String]).returns(Integer) }
+  def source_line(path)
 
     # find the line number of this operation() in the *original* file
     yaml_filename = __source

lib/arch_obj_models/instruction.rb

@@ -761,7 +761,7 @@ def operation_ast
         self,
         symtab: cfg_arch.symtab,
         input_file: @data["$source"],
-        input_line: source_line("operation()")
+        input_line: source_line(["operation()"])
       )
 
       raise "unexpected #{ast.class}" unless ast.is_a?(Idl::FunctionBodyAst)

lib/config.rb

@@ -320,7 +320,7 @@ def initialize(portfolio_grp)
     @portfolio_grp = portfolio_grp
 
     portfolio_grp.portfolios.each do |portfolio|
-      raise "Portfolio #{portfolio.name} shouldn't have a non-nil cfg_arch member" unless portfolio.cfg_arch.nil?
+      raise "Portfolio #{portfolio.name} shouldn't have a non-nil cfg_arch member" if portfolio.cfg_arch?
       raise "Portfolio #{portfolio.name} shouldn't have a an arch member of type ConfiguredArchitecture" if portfolio.arch.is_a?(ConfiguredArchitecture)
     end
   end