Add missing includes for USE_STD_STRING

tautschnig · tautschnig · commit 35720db99997 · 2023-11-15T16:06:36.000Z
These headers are only brought in by dstring.h, which we don't use when
building with `USE_STD_STRING` set.
diff --git a/jbmc/src/java_bytecode/character_refine_preprocess.h b/jbmc/src/java_bytecode/character_refine_preprocess.h
@@ -23,6 +23,7 @@ Date:   March 2017
 #include <util/mp_arith.h>
 #include <util/std_code_base.h>
 
+#include <list>
 #include <unordered_map>
 
 class code_function_callt;
diff --git a/jbmc/src/java_bytecode/java_bytecode_parse_tree.h b/jbmc/src/java_bytecode/java_bytecode_parse_tree.h
@@ -10,15 +10,16 @@ Author: Daniel Kroening, kroening@kroening.com
 #ifndef CPROVER_JAVA_BYTECODE_JAVA_BYTECODE_PARSE_TREE_H
 #define CPROVER_JAVA_BYTECODE_JAVA_BYTECODE_PARSE_TREE_H
 
-#include <set>
-#include <map>
-
 #include <util/optional.h>
 #include <util/std_types.h>
 
 #include "bytecode_info.h"
 #include "java_types.h"
 
+#include <list>
+#include <map>
+#include <set>
+
 struct java_bytecode_parse_treet
 {
   // Disallow copy construction and copy assignment, but allow move construction
diff --git a/jbmc/src/java_bytecode/java_class_loader_base.h b/jbmc/src/java_bytecode/java_class_loader_base.h
@@ -14,6 +14,8 @@ Author: Daniel Kroening, kroening@kroening.com
 
 #include "jar_pool.h"
 
+#include <list>
+
 class message_handlert;
 struct java_bytecode_parse_treet;
 
diff --git a/src/crangler/c_wrangler.cpp b/src/crangler/c_wrangler.cpp
@@ -23,6 +23,7 @@ Author: Daniel Kroening, dkr@amazon.com
 
 #include <fstream> // IWYU pragma: keep
 #include <iostream>
+#include <list>
 #include <map>
 #include <regex>
 #include <sstream>
diff --git a/src/goto-cc/compile.h b/src/goto-cc/compile.h
@@ -18,6 +18,7 @@ Date: June 2006
 #include <util/std_types.h>
 #include <util/symbol.h>
 
+#include <list>
 #include <map>
 
 class cmdlinet;
diff --git a/src/goto-cc/ld_mode.h b/src/goto-cc/ld_mode.h
@@ -17,6 +17,8 @@ Date: June 2006
 #include "gcc_message_handler.h"
 #include "goto_cc_mode.h"
 
+#include <list>
+
 class ld_modet : public goto_cc_modet
 {
 public:
diff --git a/src/goto-cc/linker_script_merge.h b/src/goto-cc/linker_script_merge.h
@@ -5,11 +5,12 @@
 #ifndef CPROVER_GOTO_CC_LINKER_SCRIPT_MERGE_H
 #define CPROVER_GOTO_CC_LINKER_SCRIPT_MERGE_H
 
+#include <util/message.h>
+
 #include <functional>
+#include <list>
 #include <map>
 
-#include <util/message.h>
-
 class cmdlinet;
 class exprt; // IWYU pragma: keep
 class goto_modelt;
diff --git a/src/goto-harness/recursive_initialization.h b/src/goto-harness/recursive_initialization.h
@@ -9,16 +9,17 @@ Author: Diffblue Ltd.
 #ifndef CPROVER_GOTO_HARNESS_RECURSIVE_INITIALIZATION_H
 #define CPROVER_GOTO_HARNESS_RECURSIVE_INITIALIZATION_H
 
-#include <map>
-#include <set>
-#include <unordered_set>
-
 #include <util/cprover_prefix.h>
 #include <util/optional.h>
 #include <util/prefix.h>
 #include <util/std_expr.h>
 #include <util/symbol.h>
 
+#include <list>
+#include <map>
+#include <set>
+#include <unordered_set>
+
 class code_blockt;
 class goto_modelt;
 
diff --git a/src/goto-programs/goto_program.h b/src/goto-programs/goto_program.h
@@ -12,16 +12,17 @@ Author: Daniel Kroening, kroening@kroening.com
 #ifndef CPROVER_GOTO_PROGRAMS_GOTO_PROGRAM_H
 #define CPROVER_GOTO_PROGRAMS_GOTO_PROGRAM_H
 
+#include <util/invariant.h>
+#include <util/source_location.h>
+
 #include "goto_instruction_code.h"
 
 #include <iosfwd>
-#include <set>
 #include <limits>
+#include <list>
+#include <set>
 #include <string>
 
-#include <util/invariant.h>
-#include <util/source_location.h>
-
 class code_gotot;
 class namespacet;
 enum class validation_modet;
diff --git a/src/goto-programs/graphml_witness.cpp b/src/goto-programs/graphml_witness.cpp
@@ -20,6 +20,7 @@ Author: Daniel Kroening
 #include <util/prefix.h>
 #include <util/ssa_expr.h>
 #include <util/string_constant.h>
+#include <util/string_container.h>
 #include <util/symbol.h>
 
 #include <ansi-c/expr2c.h>
diff --git a/src/goto-symex/symex_main.cpp b/src/goto-symex/symex_main.cpp
@@ -9,25 +9,25 @@ Author: Daniel Kroening, kroening@kroening.com
 /// \file
 /// Symbolic Execution
 
-#include "goto_symex.h"
-
-#include <memory>
-
-#include <pointer-analysis/value_set_dereference.h>
-
 #include <util/exception_utils.h>
 #include <util/expr_iterator.h>
 #include <util/expr_util.h>
 #include <util/format.h>
 #include <util/format_expr.h>
 #include <util/invariant.h>
+#include <util/magic.h>
 #include <util/make_unique.h>
 #include <util/mathematical_expr.h>
 #include <util/replace_symbol.h>
 #include <util/std_expr.h>
 
+#include <pointer-analysis/value_set_dereference.h>
+
+#include "goto_symex.h"
 #include "path_storage.h"
 
+#include <memory>
+
 symex_configt::symex_configt(const optionst &options)
   : max_depth(options.get_unsigned_int_option("depth")),
     doing_path_exploration(options.is_set("paths")),
diff --git a/src/goto-synthesizer/expr_enumerator.h b/src/goto-synthesizer/expr_enumerator.h
@@ -11,6 +11,7 @@ Author: Qinheping Hu
 
 #include <util/expr.h>
 
+#include <list>
 #include <map>
 #include <set>
 
diff --git a/src/solvers/flattening/bv_utils.cpp b/src/solvers/flattening/bv_utils.cpp
@@ -8,6 +8,7 @@ Author: Daniel Kroening, kroening@kroening.com
 
 #include "bv_utils.h"
 
+#include <list>
 #include <utility>
 
 bvt bv_utilst::build_constant(const mp_integer &n, std::size_t width)
diff --git a/src/solvers/strings/string_constraint_instantiation.cpp b/src/solvers/strings/string_constraint_instantiation.cpp
@@ -10,15 +10,17 @@ Author: Jesse Sigal, jesse.sigal@diffblue.com
 /// Defines related function for string constraints.
 
 #include "string_constraint_instantiation.h"
-#include <algorithm>
-#include <unordered_set>
 
 #include <util/arith_tools.h>
 #include <util/expr_iterator.h>
 #include <util/format_expr.h>
 
 #include "string_constraint.h"
 
+#include <algorithm>
+#include <list>
+#include <unordered_set>
+
 /// Look for symbol \p qvar in the expression \p index and return true if found
 /// \return True, iff \p qvar appears in \p index.
 static bool contains(const exprt &index, const symbol_exprt &qvar)
diff --git a/src/statement-list/statement_list_parse_tree.h b/src/statement-list/statement_list_parse_tree.h
@@ -15,6 +15,8 @@ Author: Matthias Weiss, matthias.weiss@diffblue.com
 #include <util/std_code_base.h>
 #include <util/std_expr.h>
 
+#include <list>
+
 /// Intermediate representation of a parsed Statement List file before
 /// converting it into a goto program. Contains all data structures that are
 /// necessary for describing Statement List functions and function blocks.
diff --git a/src/util/symbol_table_base.h b/src/util/symbol_table_base.h
@@ -8,6 +8,7 @@
 
 #include "symbol.h" // IWYU pragma: keep
 
+#include <list>
 #include <map>
 #include <unordered_map>
 
diff --git a/unit/compound_block_locations.h b/unit/compound_block_locations.h
@@ -7,6 +7,7 @@
 
 #include <util/irep.h>
 
+#include <list>
 #include <string>
 
 class exprt;
diff --git a/unit/goto-symex/apply_condition.cpp b/unit/goto-symex/apply_condition.cpp
@@ -6,12 +6,12 @@ Author: Owen Mansel-Chan, owen.mansel-chan@diffblue.com
 
 \*******************************************************************/
 
-#include <testing-utils/use_catch.h>
-
+#include <util/magic.h>
 #include <util/namespace.h>
 #include <util/symbol_table.h>
 
 #include <goto-symex/goto_symex_state.h>
+#include <testing-utils/use_catch.h>
 
 static void add_to_symbol_table(
   symbol_tablet &symbol_table,
diff --git a/unit/goto-symex/goto_symex_state.cpp b/unit/goto-symex/goto_symex_state.cpp
@@ -6,15 +6,16 @@ Author: Diffblue Ltd.
 
 \*******************************************************************/
 
-#include <testing-utils/use_catch.h>
-
-#include <analyses/dirty.h>
-#include <goto-symex/goto_symex_state.h>
 #include <util/arith_tools.h>
 #include <util/c_types.h>
+#include <util/magic.h>
 #include <util/namespace.h>
 #include <util/symbol_table.h>
 
+#include <analyses/dirty.h>
+#include <goto-symex/goto_symex_state.h>
+#include <testing-utils/use_catch.h>
+
 static void add_to_symbol_table(
   symbol_tablet &symbol_table,
   const symbol_exprt &symbol_expr)
diff --git a/unit/goto-symex/symex_assign.cpp b/unit/goto-symex/symex_assign.cpp
@@ -8,6 +8,7 @@ Author: Romain Brenguier, romain.brenguier@diffblue.com
 
 #include <util/arith_tools.h>
 #include <util/bitvector_types.h>
+#include <util/magic.h>
 #include <util/namespace.h>
 #include <util/options.h>
 #include <util/symbol_table.h>
diff --git a/unit/goto-symex/try_evaluate_pointer_comparisons.cpp b/unit/goto-symex/try_evaluate_pointer_comparisons.cpp
@@ -6,11 +6,11 @@ Author: Romain Brenguier, romain.brenguier@diffblue.com
 
 \*******************************************************************/
 
-#include <testing-utils/use_catch.h>
+#include <util/c_types.h>
+#include <util/magic.h>
 
 #include <goto-symex/goto_symex.h>
-
-#include <util/c_types.h>
+#include <testing-utils/use_catch.h>
 
 static void add_to_symbol_table(
   symbol_tablet &symbol_table,

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@ Date: June 2006`
`17`	`17`	`#include "gcc_message_handler.h"`
`18`	`18`	`#include "goto_cc_mode.h"`
`19`	`19`
	`20`	`+#include <list>`
	`21`	`+`
`20`	`22`	`class ld_modet : public goto_cc_modet`
`21`	`23`	`{`
`22`	`24`	`public:`