Do not mark codet objects as having typet(ID_code)

tautschnig · tautschnig · commit 661dd88044c2 · 2019-02-07T11:24:25.000Z
This has been cleaned up in f573d97 already, and future changes might see complete removal of type() from codet.
diff --git a/src/ansi-c/parser_static.inc b/src/ansi-c/parser_static.inc
@@ -82,7 +82,6 @@ Function: statement
 static void statement(YYSTYPE &expr, const irep_idt &id)
 {
   set(expr, ID_code);
-  stack(expr).type().id(ID_code);
   stack(expr).set(ID_statement, id);
 }
 
diff --git a/src/cpp/cpp_typecheck_code.cpp b/src/cpp/cpp_typecheck_code.cpp
@@ -25,12 +25,12 @@ void cpp_typecheckt::typecheck_code(codet &code)
 
   if(statement==ID_try_catch)
   {
-    code.type() = code_typet({}, empty_typet());
+    code.type() = empty_typet();
     typecheck_try_catch(code);
   }
   else if(statement==ID_member_initializer)
   {
-    code.type() = code_typet({}, empty_typet());
+    code.type() = empty_typet();
     typecheck_member_initializer(code);
   }
   else if(statement==ID_msc_if_exists ||

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,6 @@ Function: statement`
`82`	`82`	`static void statement(YYSTYPE &expr, const irep_idt &id)`
`83`	`83`	`{`
`84`	`84`	`set(expr, ID_code);`
`85`		`- stack(expr).type().id(ID_code);`
`86`	`85`	`stack(expr).set(ID_statement, id);`
`87`	`86`	`}`
`88`	`87`
Original file line number	Diff line number	Diff line change
`@@ -25,12 +25,12 @@ void cpp_typecheckt::typecheck_code(codet &code)`
`25`	`25`
`26`	`26`	`if(statement==ID_try_catch)`
`27`	`27`	`{`
`28`		`- code.type() = code_typet({}, empty_typet());`
	`28`	`+ code.type() = empty_typet();`
`29`	`29`	`typecheck_try_catch(code);`
`30`	`30`	`}`
`31`	`31`	`else if(statement==ID_member_initializer)`
`32`	`32`	`{`
`33`		`- code.type() = code_typet({}, empty_typet());`
	`33`	`+ code.type() = empty_typet();`
`34`	`34`	`typecheck_member_initializer(code);`
`35`	`35`	`}`
`36`	`36`	`else if(statement==ID_msc_if_exists \|\|`