Merge pull request #1466 from diffblue/resolve-typedefs

Verilog: use resolver for typedefs

Author: tautschnig

regression/verilog/modules/parameters11.desc

@@ -1,4 +1,4 @@
-KNOWNBUG
+CORE
 parameters11.sv
 --bound 0
 ^EXIT=0$

src/verilog/parser.y

@@ -4734,7 +4734,6 @@ type_identifier: TOK_TYPE_IDENTIFIER
 		  init($$, ID_typedef_type);
 		  auto base_name = stack_expr($1).id();
 		  stack_expr($$).set(ID_base_name, base_name);
-		  stack_expr($$).set(ID_identifier, PARSER.scopes.current_scope().prefix+id2string(base_name));
 		}
 	;
 

src/verilog/verilog_elaborate_type.cpp

@@ -172,18 +172,26 @@ typet verilog_typecheck_exprt::elaborate_package_scope_typedef(
       << "verilog_package_scope expects typedef_type on the rhs";
 
   auto package_base_name = src.subtypes()[0].id();
-  auto typedef_base_name = src.subtypes()[1].get(ID_base_name);
+  auto typedef_base_name =
+    to_verilog_typedef_type(src.subtypes()[1]).base_name();
 
   // stitch together
   irep_idt full_identifier =
     id2string(verilog_package_identifier(package_base_name)) + '.' +
     id2string(typedef_base_name);
 
-  // recursive call
-  verilog_typedef_typet full_typedef_type(full_identifier);
-  full_typedef_type.set(ID_identifier, full_identifier);
+  // look it up
+  const symbolt *symbol_ptr;
 
-  return elaborate_type(full_typedef_type);
+  if(ns.lookup(full_identifier, symbol_ptr))
+    throw errort().with_location(location)
+      << "symbol " << typedef_base_name << " not found in package";
+
+  // must be type
+  if(!symbol_ptr->is_type)
+    throw errort().with_location(location) << "expected a type identifier";
+
+  return symbol_ptr->type;
 }
 
 /*******************************************************************\
@@ -334,18 +342,17 @@ typet verilog_typecheck_exprt::elaborate_type(const typet &src)
   else if(src.id() == ID_typedef_type)
   {
     // Look it up!
-    const symbolt *symbol_ptr;
-
-    auto identifier = to_verilog_typedef_type(src).identifier();
+    auto base_name = to_verilog_typedef_type(src).base_name();
+    const auto *symbol_ptr = resolve(base_name);
 
-    if(ns.lookup(identifier, symbol_ptr))
+    if(symbol_ptr == nullptr)
       throw errort().with_location(source_location)
-        << "type symbol " << identifier << " not found";
+        << "type symbol " << base_name << " not found";
 
     DATA_INVARIANT(symbol_ptr->is_type, "typedef symbols must be types");
 
     // elaborate that typedef symbol, recursively, if needed
-    elaborate_symbol_rec(identifier);
+    elaborate_symbol_rec(symbol_ptr->name);
 
     auto result = symbol_ptr->type; // copy
     return result.with_source_location(source_location);

src/verilog/verilog_typecheck_expr.cpp

@@ -1270,11 +1270,8 @@ Function: verilog_typecheck_exprt::resolve
 
 \*******************************************************************/
 
-const symbolt *
-verilog_typecheck_exprt::resolve(const verilog_identifier_exprt &expr)
+const symbolt *verilog_typecheck_exprt::resolve(const irep_idt base_name)
 {
-  const irep_idt &base_name = expr.base_name();
-
   // in a task or function? Try local ones first
   if(function_or_task_name!="")
   {
@@ -1327,8 +1324,8 @@ exprt verilog_typecheck_exprt::convert_verilog_identifier(
   verilog_identifier_exprt expr,
   const std::optional<typet> &implicit_net_type)
 {
-  auto symbol = resolve(expr);
   auto base_name = expr.base_name();
+  auto symbol = resolve(base_name);
 
   if(symbol != nullptr)
   { 

src/verilog/verilog_typecheck_expr.h

@@ -174,7 +174,7 @@ class verilog_typecheck_exprt:public verilog_typecheck_baset
 protected:
   [[nodiscard]] exprt convert_expr_rec(exprt expr);
   [[nodiscard]] exprt convert_constant(constant_exprt);
-  [[nodiscard]] const symbolt *resolve(const verilog_identifier_exprt &);
+  [[nodiscard]] const symbolt *resolve(irep_idt base_name);
   [[nodiscard]] exprt convert_verilog_identifier(
     verilog_identifier_exprt,
     const std::optional<typet> &implicit_net_type);

src/verilog/verilog_types.h

@@ -777,20 +777,20 @@ inline verilog_event_typet &to_verilog_event_type(typet &type)
 class verilog_typedef_typet : public typet
 {
 public:
-  explicit verilog_typedef_typet(const irep_idt &_identifier)
+  explicit verilog_typedef_typet(const irep_idt &_base_name)
     : typet(ID_typedef_type)
   {
-    identifier(_identifier);
+    base_name(_base_name);
   }
 
-  void identifier(const irep_idt &identifier)
+  void base_name(const irep_idt &base_name)
   {
-    set(ID_identifier, identifier);
+    set(ID_base_name, base_name);
   }
 
-  const irep_idt &identifier() const
+  const irep_idt &base_name() const
   {
-    return get(ID_identifier);
+    return get(ID_base_name);
   }
 };