C front-end: use config.ansi_c.mode to pick compiler-specific configuration

tautschnig · tautschnig · commit 446771949501 · 2022-02-26T21:23:22.000Z
The preprocessor variant is only relevant for c_preprocess, and isn't actually set by goto-cc (which does not use c_preprocess). Fixes: #2370
diff --git a/src/ansi-c/c_typecheck_expr.cpp b/src/ansi-c/c_typecheck_expr.cpp
@@ -3092,9 +3092,7 @@ exprt c_typecheck_baset::do_special_functions(
     {
       // clang returns 4 for _Bool, gcc treats these as 'int'.
       type_number =
-        config.ansi_c.preprocessor == configt::ansi_ct::preprocessort::CLANG
-          ? 4u
-          : 1u;
+        config.ansi_c.mode == configt::ansi_ct::flavourt::CLANG ? 4u : 1u;
     }
     else
     {

Original file line number	Diff line number	Diff line change
`@@ -3092,9 +3092,7 @@ exprt c_typecheck_baset::do_special_functions(`
`3092`	`3092`	`{`
`3093`	`3093`	`// clang returns 4 for _Bool, gcc treats these as 'int'.`
`3094`	`3094`	`type_number =`
`3095`		`- config.ansi_c.preprocessor == configt::ansi_ct::preprocessort::CLANG`
`3096`		`- ? 4u`
`3097`		`- : 1u;`
	`3095`	`+ config.ansi_c.mode == configt::ansi_ct::flavourt::CLANG ? 4u : 1u;`
`3098`	`3096`	`}`
`3099`	`3097`	`else`
`3100`	`3098`	`{`