Merge pull request #2073 from tautschnig/reset-namespace

tautschnig · web-flow · commit 973b30920140 · 2018-04-27T20:39:42.000+01:00
Reset namespace after symbolic execution
diff --git a/src/goto-symex/symex_main.cpp b/src/goto-symex/symex_main.cpp
@@ -208,6 +208,9 @@ void goto_symext::symex_with_state(
   // execution, so return the names generated through symbolic execution
   // through `new_symbol_table`.
   new_symbol_table = state.symbol_table;
+  // reset the namespace back to a sane state as state.symbol_table might go out
+  // of scope
+  ns = namespacet(outer_symbol_table);
 }
 
 void goto_symext::resume_symex_from_saved_state(

Original file line number	Diff line number	Diff line change
`@@ -208,6 +208,9 @@ void goto_symext::symex_with_state(`
`208`	`208`	`// execution, so return the names generated through symbolic execution`
`209`	`209`	// through `new_symbol_table`.
`210`	`210`	`new_symbol_table = state.symbol_table;`
	`211`	`+ // reset the namespace back to a sane state as state.symbol_table might go out`
	`212`	`+ // of scope`
	`213`	`+ ns = namespacet(outer_symbol_table);`
`211`	`214`	`}`
`212`	`215`
`213`	`216`	`void goto_symext::resume_symex_from_saved_state(`