Remove use of base_type_eq in disabled code

smowton · Daniel Kroening · commit 3ed11d6c8424 · 2019-02-13T12:26:21.000Z
diff --git a/src/goto-programs/link_goto_model.cpp b/src/goto-programs/link_goto_model.cpp
@@ -118,13 +118,12 @@ static bool link_functions(
       const irep_idt &id = to_symbol_expr(symbol.value).get_identifier();
 
       #if 0
-      if(!base_type_eq(symbol.type, ns.lookup(id).type, ns))
+      if(symbol.type != ns.lookup(id).type)
       {
         std::cerr << symbol << '\n';
         std::cerr << ns.lookup(id) << '\n';
       }
-      INVARIANT(base_type_eq(symbol.type, ns.lookup(id).type, ns),
-                "type matches");
+      INVARIANT(symbol.type == ns.lookup(id).type, "type matches");
       #endif
 
       macro_application.insert_expr(symbol.name, id);

Original file line number	Diff line number	Diff line change
`@@ -118,13 +118,12 @@ static bool link_functions(`
`118`	`118`	`const irep_idt &id = to_symbol_expr(symbol.value).get_identifier();`
`119`	`119`
`120`	`120`	`#if 0`
`121`		`- if(!base_type_eq(symbol.type, ns.lookup(id).type, ns))`
	`121`	`+ if(symbol.type != ns.lookup(id).type)`
`122`	`122`	`{`
`123`	`123`	`std::cerr << symbol << '\n';`
`124`	`124`	`std::cerr << ns.lookup(id) << '\n';`
`125`	`125`	`}`
`126`		`- INVARIANT(base_type_eq(symbol.type, ns.lookup(id).type, ns),`
`127`		`- "type matches");`
	`126`	`+ INVARIANT(symbol.type == ns.lookup(id).type, "type matches");`
`128`	`127`	`#endif`
`129`	`128`
`130`	`129`	`macro_application.insert_expr(symbol.name, id);`