remove base_type_eq from goto_programt::instructiont::validate

kroening · kroening · commit edd216feb786 · 2022-07-03T20:05:52.000+01:00
diff --git a/src/goto-programs/goto_program.cpp b/src/goto-programs/goto_program.cpp
@@ -15,7 +15,6 @@ Author: Daniel Kroening, kroening@kroening.com
 
 #include <iomanip>
 
-#include <util/base_type.h>
 #include <util/expr_iterator.h>
 #include <util/find_symbols.h>
 #include <util/format_expr.h>
@@ -808,7 +807,7 @@ void goto_programt::instructiont::validate(
         if(!ns.lookup(goto_id, table_symbol))
         {
           bool symbol_expr_type_matches_symbol_table =
-            base_type_eq(goto_symbol_expr.type(), table_symbol->type, ns);
+            goto_symbol_expr.type() == table_symbol->type;
 
           if(
             !symbol_expr_type_matches_symbol_table &&
@@ -831,7 +830,7 @@ void goto_programt::instructiont::validate(
                 table_symbol_type.return_type();
 
               symbol_expr_type_matches_symbol_table =
-                base_type_eq(goto_symbol_expr_type, table_symbol_type, ns);
+                goto_symbol_expr_type == table_symbol_type;
             }
           }
 

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@ Author: Daniel Kroening, [email protected]`
`15`	`15`
`16`	`16`	`#include <iomanip>`
`17`	`17`
`18`		`-#include <util/base_type.h>`
`19`	`18`	`#include <util/expr_iterator.h>`
`20`	`19`	`#include <util/find_symbols.h>`
`21`	`20`	`#include <util/format_expr.h>`
`@@ -808,7 +807,7 @@ void goto_programt::instructiont::validate(`
`808`	`807`	`if(!ns.lookup(goto_id, table_symbol))`
`809`	`808`	`{`
`810`	`809`	`bool symbol_expr_type_matches_symbol_table =`
`811`		`- base_type_eq(goto_symbol_expr.type(), table_symbol->type, ns);`
	`810`	`+ goto_symbol_expr.type() == table_symbol->type;`
`812`	`811`
`813`	`812`	`if(`
`814`	`813`	`!symbol_expr_type_matches_symbol_table &&`
`@@ -831,7 +830,7 @@ void goto_programt::instructiont::validate(`
`831`	`830`	`table_symbol_type.return_type();`
`832`	`831`
`833`	`832`	`symbol_expr_type_matches_symbol_table =`
`834`		`- base_type_eq(goto_symbol_expr_type, table_symbol_type, ns);`
	`833`	`+ goto_symbol_expr_type == table_symbol_type;`
`835`	`834`	`}`
`836`	`835`	`}`
`837`	`836`