Merge pull request #7167 from tautschnig/cleanup/ini

tautschnig · web-flow · commit e4848466ea61 · 2022-10-03T14:55:18.000+02:00
Nondet static: fix up name of C++ initialisation procedure
diff --git a/src/goto-instrument/nondet_static.cpp b/src/goto-instrument/nondet_static.cpp
@@ -108,8 +108,12 @@ static void nondet_static(
     {
       const symbol_exprt &fsym = to_symbol_expr(instruction.call_function());
 
-      if(has_prefix(id2string(fsym.get_identifier()), "#ini#"))
+      // see cpp/cpp_typecheck.cpp, which creates initialization functions
+      if(has_prefix(
+           id2string(fsym.get_identifier()), "#cpp_dynamic_initialization#"))
+      {
         nondet_static(ns, goto_functions, fsym.get_identifier());
+      }
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -108,8 +108,12 @@ static void nondet_static(`
`108`	`108`	`{`
`109`	`109`	`const symbol_exprt &fsym = to_symbol_expr(instruction.call_function());`
`110`	`110`
`111`		`- if(has_prefix(id2string(fsym.get_identifier()), "#ini#"))`
	`111`	`+ // see cpp/cpp_typecheck.cpp, which creates initialization functions`
	`112`	`+ if(has_prefix(`
	`113`	`+ id2string(fsym.get_identifier()), "#cpp_dynamic_initialization#"))`
	`114`	`+ {`
`112`	`115`	`nondet_static(ns, goto_functions, fsym.get_identifier());`
	`116`	`+ }`
`113`	`117`	`}`
`114`	`118`	`}`
`115`	`119`