use dstringt::starts_with(s)

Daniel Kroening · Daniel Kroening · commit 5788edfa3558 · 2020-09-04T09:50:33.000+01:00
diff --git a/src/analyses/goto_check.cpp b/src/analyses/goto_check.cpp
@@ -1215,7 +1215,7 @@ void goto_checkt::pointer_primitive_check(
   {
     const auto &symbol_expr = to_symbol_expr(pointer);
 
-    if(has_prefix(id2string(symbol_expr.get_identifier()), CPROVER_PREFIX))
+    if(symbol_expr.get_identifier().starts_with(CPROVER_PREFIX))
       return;
   }
 
diff --git a/src/ansi-c/c_preprocess.cpp b/src/ansi-c/c_preprocess.cpp
@@ -537,7 +537,7 @@ bool c_preprocess_gcc_clang(
   {
     if(arch == "i386" || arch == "x86_64" || arch == "x32")
       argv.push_back("-m16");
-    else if(has_prefix(id2string(arch), "mips"))
+    else if(arch.starts_with("mips"))
       argv.push_back("-mips16");
   }
   else if(config.ansi_c.pointer_width == 32)
@@ -546,7 +546,7 @@ bool c_preprocess_gcc_clang(
       argv.push_back("-m32");
     else if(arch == "x32")
       argv.push_back("-mx32");
-    else if(has_prefix(id2string(arch), "mips"))
+    else if(arch.starts_with("mips"))
       argv.push_back("-mabi=32");
     else if(arch == "powerpc" || arch == "ppc64" || arch == "ppc64le")
       argv.push_back("-m32");
@@ -559,7 +559,7 @@ bool c_preprocess_gcc_clang(
   {
     if(arch == "i386" || arch == "x86_64" || arch == "x32")
       argv.push_back("-m64");
-    else if(has_prefix(id2string(arch), "mips"))
+    else if(arch.starts_with("mips"))
       argv.push_back("-mabi=64");
     else if(arch == "powerpc" || arch == "ppc64" || arch == "ppc64le")
       argv.push_back("-m64");
diff --git a/src/ansi-c/c_typecheck_expr.cpp b/src/ansi-c/c_typecheck_expr.cpp
@@ -843,7 +843,7 @@ void c_typecheck_baset::typecheck_expr_symbol(exprt &expr)
     // preserve location
     expr.add_source_location()=source_location;
   }
-  else if(has_prefix(id2string(identifier), CPROVER_PREFIX "constant_infinity"))
+  else if(identifier.starts_with(CPROVER_PREFIX "constant_infinity"))
   {
     expr=infinity_exprt(symbol.type);
 
@@ -1832,7 +1832,7 @@ void c_typecheck_baset::typecheck_expr_side_effect(side_effect_exprt &expr)
       throw 0;
     }
   }
-  else if(has_prefix(id2string(statement), "assign"))
+  else if(statement.starts_with("assign"))
     typecheck_side_effect_assignment(expr);
   else if(statement==ID_function_call)
     typecheck_side_effect_function_call(
diff --git a/src/ansi-c/c_typecheck_initializer.cpp b/src/ansi-c/c_typecheck_initializer.cpp
@@ -221,7 +221,7 @@ exprt c_typecheck_baset::do_initializer_rec(
 void c_typecheck_baset::do_initializer(symbolt &symbol)
 {
   // this one doesn't need initialization
-  if(has_prefix(id2string(symbol.name), CPROVER_PREFIX "constant_infinity"))
+  if(symbol.name.starts_with(CPROVER_PREFIX "constant_infinity"))
     return;
 
   if(symbol.is_static_lifetime)
diff --git a/src/ansi-c/expr2c.cpp b/src/ansi-c/expr2c.cpp
@@ -1604,7 +1604,7 @@ std::string expr2ct::convert_symbol(const exprt &src)
     dest=id2string(entry->second);
 
     #if 0
-    if(has_prefix(id2string(id), SYMEX_DYNAMIC_PREFIX "dynamic_object"))
+    if(id.starts_with(SYMEX_DYNAMIC_PREFIX "dynamic_object"))
     {
       if(sizeof_nesting++ == 0)
         dest+=" /*"+convert(src.type());
@@ -1908,9 +1908,9 @@ std::string expr2ct::convert_constant(
       {
         const irep_idt &op_value = to_constant_expr(annotation).get_value();
 
-        if(op_value=="INVALID" ||
-           has_prefix(id2string(op_value), "INVALID-") ||
-           op_value=="NULL+offset")
+        if(
+          op_value == "INVALID" || op_value.starts_with("INVALID-") ||
+          op_value == "NULL+offset")
           dest=id2string(op_value);
         else
           return convert_norep(src, precedence);
diff --git a/src/cpp/cpp_typecheck_resolve.cpp b/src/cpp/cpp_typecheck_resolve.cpp
@@ -809,7 +809,7 @@ exprt cpp_typecheck_resolvet::do_builtin(
 
     dest=type_exprt(typet(base_name));
   }
-  else if(has_prefix(id2string(base_name), "constant_infinity"))
+  else if(base_name.starts_with("constant_infinity"))
   {
     // ok, but type missing
     dest=exprt(ID_infinity, size_type());
diff --git a/src/goto-cc/compile.cpp b/src/goto-cc/compile.cpp
@@ -726,7 +726,7 @@ bool compilet::add_written_cprover_symbols(const symbol_tablet &symbol_table)
   {
     const irep_idt &name=pair.second.name;
     const typet &new_type=pair.second.type;
-    if(!(has_prefix(id2string(name), CPROVER_PREFIX) && new_type.id()==ID_code))
+    if(!(name.starts_with(CPROVER_PREFIX) && new_type.id() == ID_code))
       continue;
 
     bool inserted;
diff --git a/src/goto-harness/recursive_initialization.cpp b/src/goto-harness/recursive_initialization.cpp
@@ -1019,7 +1019,7 @@ code_blockt recursive_initializationt::build_function_pointer_constructor(
         : "";
     // skip referencing globals because the corresponding symbols in the symbol
     // table are no longer marked as file local.
-    if(has_prefix(id2string(sym_to_lookup), FILE_LOCAL_PREFIX))
+    if(sym_to_lookup.starts_with(FILE_LOCAL_PREFIX))
     {
       continue;
     }
diff --git a/src/goto-instrument/branch.cpp b/src/goto-instrument/branch.cpp
@@ -24,7 +24,7 @@ void branch(
   Forall_goto_functions(f_it, goto_model.goto_functions)
   {
     // don't instrument our internal functions
-    if(has_prefix(id2string(f_it->first), CPROVER_PREFIX))
+    if(f_it->first.starts_with(CPROVER_PREFIX))
       continue;
 
     // don't instrument the function to be called,
diff --git a/src/goto-instrument/count_eloc.cpp b/src/goto-instrument/count_eloc.cpp
@@ -185,7 +185,7 @@ void print_global_state_size(const goto_modelt &goto_model)
     if(
       symbol.is_type || symbol.is_macro || symbol.type.id() == ID_code ||
       symbol.type.get_bool(ID_C_constant) ||
-      has_prefix(id2string(symbol.name), CPROVER_PREFIX) ||
+      symbol.name.starts_with(CPROVER_PREFIX) ||
       (has_initialize && initialized.find(symbol.name) == initialized.end()))
     {
       continue;
diff --git a/src/goto-instrument/cover_filter.cpp b/src/goto-instrument/cover_filter.cpp
@@ -33,7 +33,7 @@ bool internal_functions_filtert::operator()(
     return false;
 
   // ignore Java built-ins (synthetic functions)
-  if(has_prefix(id2string(function.name), "java::array["))
+  if(function.name.starts_with("java::array["))
     return false;
 
   // ignore if built-in library
diff --git a/src/goto-instrument/function.cpp b/src/goto-instrument/function.cpp
@@ -76,7 +76,7 @@ void function_enter(
   Forall_goto_functions(f_it, goto_model.goto_functions)
   {
     // don't instrument our internal functions
-    if(has_prefix(id2string(f_it->first), CPROVER_PREFIX))
+    if(f_it->first.starts_with(CPROVER_PREFIX))
       continue;
 
     // don't instrument the function to be called,
@@ -101,7 +101,7 @@ void function_exit(
   Forall_goto_functions(f_it, goto_model.goto_functions)
   {
     // don't instrument our internal functions
-    if(has_prefix(id2string(f_it->first), CPROVER_PREFIX))
+    if(f_it->first.starts_with(CPROVER_PREFIX))
       continue;
 
     // don't instrument the function to be called,
diff --git a/src/goto-instrument/goto_program2code.cpp b/src/goto-instrument/goto_program2code.cpp
@@ -254,8 +254,8 @@ void goto_program2codet::convert_labels(
       ++it)
   {
     if(
-      has_prefix(id2string(*it), CPROVER_PREFIX "ASYNC_") ||
-      has_prefix(id2string(*it), CPROVER_PREFIX "DUMP_L"))
+      it->starts_with(CPROVER_PREFIX "ASYNC_") ||
+      it->starts_with(CPROVER_PREFIX "DUMP_L"))
     {
       continue;
     }
@@ -1190,8 +1190,8 @@ goto_programt::const_targett goto_program2codet::convert_goto_goto(
       ++it)
   {
     if(
-      has_prefix(id2string(*it), CPROVER_PREFIX "ASYNC_") ||
-      has_prefix(id2string(*it), CPROVER_PREFIX "DUMP_L"))
+      it->starts_with(CPROVER_PREFIX "ASYNC_") ||
+      it->starts_with(CPROVER_PREFIX "DUMP_L"))
     {
       continue;
     }
@@ -1253,7 +1253,7 @@ goto_programt::const_targett goto_program2codet::convert_start_thread(
         it=target->labels.begin();
         it!=target->labels.end();
         ++it)
-      if(has_prefix(id2string(*it), CPROVER_PREFIX "ASYNC_"))
+      if(it->starts_with(CPROVER_PREFIX "ASYNC_"))
       {
         labels_in_use.insert(*it);
 
@@ -1318,7 +1318,7 @@ goto_programt::const_targett goto_program2codet::convert_start_thread(
       it=target->labels.begin();
       it!=target->labels.end();
       ++it)
-    if(has_prefix(id2string(*it), CPROVER_PREFIX "ASYNC_"))
+    if(it->starts_with(CPROVER_PREFIX "ASYNC_"))
     {
       labels_in_use.insert(*it);
 
@@ -1813,7 +1813,7 @@ void goto_program2codet::cleanup_expr(exprt &expr, bool no_typecast)
       {
         if(it->second.type.id()!=ID_code)
           continue;
-        if(!has_prefix(id2string(it->second.base_name), "nondet_"))
+        if(!it->second.base_name.starts_with("nondet_"))
           continue;
         const code_typet &code_type=to_code_type(it->second.type);
         if(code_type.return_type() != expr.type())
diff --git a/src/goto-instrument/nondet_static.cpp b/src/goto-instrument/nondet_static.cpp
@@ -37,7 +37,7 @@ bool is_nondet_initializable_static(
   const irep_idt &id = symbol_expr.get_identifier();
 
   // is it a __CPROVER_* variable?
-  if(has_prefix(id2string(id), CPROVER_PREFIX))
+  if(id.starts_with(CPROVER_PREFIX))
     return false;
 
   // variable not in symbol table such as symex variable?
@@ -112,7 +112,7 @@ void nondet_static(
       const code_function_callt &fct=to_code_function_call(instruction.code);
       const symbol_exprt &fsym=to_symbol_expr(fct.function());
 
-      if(has_prefix(id2string(fsym.get_identifier()), "#ini#"))
+      if(fsym.get_identifier().starts_with("#ini#"))
         nondet_static(ns, goto_functions, fsym.get_identifier());
     }
   }
diff --git a/src/goto-instrument/race_check.cpp b/src/goto-instrument/race_check.cpp
@@ -128,9 +128,11 @@ static bool is_shared(const namespacet &ns, const symbol_exprt &symbol_expr)
     identifier == CPROVER_PREFIX "alloc_size" || identifier == "stdin" ||
     identifier == "stdout" || identifier == "stderr" ||
     identifier == "sys_nerr" ||
-    has_prefix(id2string(identifier), "symex::invalid_object") ||
-    has_prefix(id2string(identifier), SYMEX_DYNAMIC_PREFIX "dynamic_object"))
+    identifier.starts_with("symex::invalid_object") ||
+    identifier.starts_with(SYMEX_DYNAMIC_PREFIX "dynamic_object"))
+  {
     return false; // no race check
+  }
 
   const symbolt &symbol=ns.lookup(identifier);
   return symbol.is_shared();
diff --git a/src/goto-instrument/wmm/shared_buffers.cpp b/src/goto-instrument/wmm/shared_buffers.cpp
@@ -953,15 +953,15 @@ bool shared_bufferst::is_buffered(
 {
   const irep_idt &identifier=symbol_expr.get_identifier();
 
-  if(identifier==CPROVER_PREFIX "alloc" ||
-     identifier==CPROVER_PREFIX "alloc_size" ||
-     identifier=="stdin" ||
-     identifier=="stdout" ||
-     identifier=="stderr" ||
-     identifier=="sys_nerr" ||
-     has_prefix(id2string(identifier), "__unbuffered_") ||
-     has_prefix(id2string(identifier), "__CPROVER"))
+  if(
+    identifier == CPROVER_PREFIX "alloc" ||
+    identifier == CPROVER_PREFIX "alloc_size" || identifier == "stdin" ||
+    identifier == "stdout" || identifier == "stderr" ||
+    identifier == "sys_nerr" || identifier.starts_with("__unbuffered_") ||
+    identifier.starts_with("__CPROVER"))
+  {
     return false; // not buffered
+  }
 
   const symbolt &symbol=ns.lookup(identifier);
 
diff --git a/src/goto-programs/builtin_functions.cpp b/src/goto-programs/builtin_functions.cpp
@@ -856,12 +856,13 @@ void goto_convertt::do_function_call_symbol(
   {
     do_prob_coin(lhs, function, arguments, dest);
   }
-  else if(has_prefix(id2string(identifier), CPROVER_PREFIX "prob_uniform_"))
+  else if(identifier.starts_with(CPROVER_PREFIX "prob_uniform_"))
   {
     do_prob_uniform(lhs, function, arguments, dest);
   }
-  else if(has_prefix(id2string(identifier), "nondet_") ||
-          has_prefix(id2string(identifier), "__VERIFIER_nondet_"))
+  else if(
+    identifier.starts_with("nondet_") ||
+    identifier.starts_with("__VERIFIER_nondet_"))
   {
     // make it a side effect if there is an LHS
     if(lhs.is_nil())
@@ -887,7 +888,7 @@ void goto_convertt::do_function_call_symbol(
     assignment.add_source_location()=function.source_location();
     copy(assignment, ASSIGN, dest);
   }
-  else if(has_prefix(id2string(identifier), CPROVER_PREFIX "uninterpreted_"))
+  else if(identifier.starts_with(CPROVER_PREFIX "uninterpreted_"))
   {
     // make it a side effect if there is an LHS
     if(lhs.is_nil())
diff --git a/src/goto-programs/goto_convert.cpp b/src/goto-programs/goto_convert.cpp
@@ -315,7 +315,7 @@ void goto_convertt::convert_label(
   // magic thread creation label.
   // The "__CPROVER_ASYNC_" signals the start of a sequence of instructions
   // that can be executed in parallel, i.e, a new thread.
-  if(has_prefix(id2string(label), CPROVER_PREFIX "ASYNC_"))
+  if(label.starts_with(CPROVER_PREFIX "ASYNC_"))
   {
     // the body of the thread is expected to be
     // in the operand.
diff --git a/src/goto-programs/goto_convert_functions.cpp b/src/goto-programs/goto_convert_functions.cpp
@@ -203,7 +203,7 @@ void goto_convert_functionst::convert_function(
   // handle SV-COMP's __VERIFIER_atomic_
   if(
     !f.body.instructions.empty() &&
-    has_prefix(id2string(identifier), "__VERIFIER_atomic_"))
+    identifier.starts_with("__VERIFIER_atomic_"))
   {
     goto_programt::instructiont a_begin;
     a_begin = goto_programt::make_atomic_begin();
diff --git a/src/goto-programs/graphml_witness.cpp b/src/goto-programs/graphml_witness.cpp
@@ -139,10 +139,10 @@ std::string graphml_witnesst::convert_assign_rec(
       assign.rhs().operands().begin();
     for(const auto &comp : components)
     {
-      if(comp.type().id()==ID_code ||
-         comp.get_is_padding() ||
-         // for some reason #is_padding gets lost in *some* cases
-         has_prefix(id2string(comp.get_name()), "$pad"))
+      if(
+        comp.type().id() == ID_code || comp.get_is_padding() ||
+        // for some reason #is_padding gets lost in *some* cases
+        comp.get_name().starts_with("$pad"))
         continue;
 
       INVARIANT(
@@ -251,7 +251,7 @@ static bool filter_out(
     // Do not filter out assertions in functions the name of which starts with
     // CPROVER_PREFIX, because we need to maintain those as violation nodes:
     // these are assertions generated, for examples, for memory leaks.
-    if(!has_prefix(id2string(id), CPROVER_PREFIX) || !it->is_assert())
+    if(!id.starts_with(CPROVER_PREFIX) || !it->is_assert())
       return true;
   }
 
@@ -262,7 +262,7 @@ static bool contains_symbol_prefix(const exprt &expr, const std::string &prefix)
 {
   if(
     expr.id() == ID_symbol &&
-    has_prefix(id2string(to_symbol_expr(expr).get_identifier()), prefix))
+    to_symbol_expr(expr).get_identifier().starts_with(prefix))
   {
     return true;
   }
diff --git a/src/goto-programs/remove_virtual_functions.cpp b/src/goto-programs/remove_virtual_functions.cpp
@@ -624,9 +624,9 @@ void get_virtual_calleest::get_functions(
                         ? b.symbol_expr->get_identifier()
                         : irep_idt();
 
-      if(has_prefix(id2string(a_id), "java::java.lang.Object"))
+      if(a_id.starts_with("java::java.lang.Object"))
         return false;
-      else if(has_prefix(id2string(b_id), "java::java.lang.Object"))
+      else if(b_id.starts_with("java::java.lang.Object"))
         return true;
       else
       {
diff --git a/src/goto-programs/show_goto_functions_json.cpp b/src/goto-programs/show_goto_functions_json.cpp
@@ -53,11 +53,10 @@ json_objectt show_goto_functions_jsont::convert(
     json_function["name"] = json_stringt(function_name);
     json_function["isBodyAvailable"]=
       jsont::json_boolean(function.body_available());
-    bool is_internal=
-      has_prefix(id2string(function_name), CPROVER_PREFIX) ||
-      has_prefix(id2string(function_name), "java::array[") ||
-      has_prefix(id2string(function_name), "java::org.cprover") ||
-      has_prefix(id2string(function_name), "java::java");
+    bool is_internal = function_name.starts_with(CPROVER_PREFIX) ||
+                       function_name.starts_with("java::array[") ||
+                       function_name.starts_with("java::org.cprover") ||
+                       function_name.starts_with("java::java");
     json_function["isInternal"]=jsont::json_boolean(is_internal);
 
     if(list_only)
diff --git a/src/goto-programs/show_goto_functions_xml.cpp b/src/goto-programs/show_goto_functions_xml.cpp
@@ -57,11 +57,10 @@ xmlt show_goto_functions_xmlt::convert(
     xml_function.set_attribute("name", id2string(function_name));
     xml_function.set_attribute_bool(
       "is_body_available", function.body_available());
-    bool is_internal=
-      has_prefix(id2string(function_name), CPROVER_PREFIX) ||
-      has_prefix(id2string(function_name), "java::array[") ||
-      has_prefix(id2string(function_name), "java::org.cprover") ||
-      has_prefix(id2string(function_name), "java::java");
+    bool is_internal = function_name.starts_with(CPROVER_PREFIX) ||
+                       function_name.starts_with("java::array[") ||
+                       function_name.starts_with("java::org.cprover") ||
+                       function_name.starts_with("java::java");
     xml_function.set_attribute_bool("is_internal", is_internal);
 
     if(list_only)
diff --git a/src/goto-programs/slice_global_inits.cpp b/src/goto-programs/slice_global_inits.cpp
diff --git a/src/goto-symex/auto_objects.cpp b/src/goto-symex/auto_objects.cpp
diff --git a/src/goto-symex/symex_function_call.cpp b/src/goto-symex/symex_function_call.cpp
diff --git a/src/jsil/jsil_typecheck.cpp b/src/jsil/jsil_typecheck.cpp
diff --git a/src/linking/static_lifetime_init.cpp b/src/linking/static_lifetime_init.cpp
diff --git a/src/pointer-analysis/value_set.cpp b/src/pointer-analysis/value_set.cpp
diff --git a/src/pointer-analysis/value_set_fi.cpp b/src/pointer-analysis/value_set_fi.cpp
diff --git a/src/util/dstring.h b/src/util/dstring.h
diff --git a/src/util/simplify_expr_pointer.cpp b/src/util/simplify_expr_pointer.cpp

Original file line number	Diff line number	Diff line change
`@@ -1215,7 +1215,7 @@ void goto_checkt::pointer_primitive_check(`
`1215`	`1215`	`{`
`1216`	`1216`	`const auto &symbol_expr = to_symbol_expr(pointer);`
`1217`	`1217`
`1218`		`- if(has_prefix(id2string(symbol_expr.get_identifier()), CPROVER_PREFIX))`
	`1218`	`+ if(symbol_expr.get_identifier().starts_with(CPROVER_PREFIX))`
`1219`	`1219`	`return;`
`1220`	`1220`	`}`
`1221`	`1221`
Original file line number	Diff line number	Diff line change
`@@ -843,7 +843,7 @@ void c_typecheck_baset::typecheck_expr_symbol(exprt &expr)`
`843`	`843`	`// preserve location`
`844`	`844`	`expr.add_source_location()=source_location;`
`845`	`845`	`}`
`846`		`- else if(has_prefix(id2string(identifier), CPROVER_PREFIX "constant_infinity"))`
	`846`	`+ else if(identifier.starts_with(CPROVER_PREFIX "constant_infinity"))`
`847`	`847`	`{`
`848`	`848`	`expr=infinity_exprt(symbol.type);`
`849`	`849`
`@@ -1832,7 +1832,7 @@ void c_typecheck_baset::typecheck_expr_side_effect(side_effect_exprt &expr)`
`1832`	`1832`	`throw 0;`
`1833`	`1833`	`}`
`1834`	`1834`	`}`
`1835`		`- else if(has_prefix(id2string(statement), "assign"))`
	`1835`	`+ else if(statement.starts_with("assign"))`
`1836`	`1836`	`typecheck_side_effect_assignment(expr);`
`1837`	`1837`	`else if(statement==ID_function_call)`
`1838`	`1838`	`typecheck_side_effect_function_call(`
Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,7 @@ exprt c_typecheck_baset::do_initializer_rec(`
`221`	`221`	`void c_typecheck_baset::do_initializer(symbolt &symbol)`
`222`	`222`	`{`
`223`	`223`	`// this one doesn't need initialization`
`224`		`- if(has_prefix(id2string(symbol.name), CPROVER_PREFIX "constant_infinity"))`
	`224`	`+ if(symbol.name.starts_with(CPROVER_PREFIX "constant_infinity"))`
`225`	`225`	`return;`
`226`	`226`
`227`	`227`	`if(symbol.is_static_lifetime)`
Original file line number	Diff line number	Diff line change
`@@ -809,7 +809,7 @@ exprt cpp_typecheck_resolvet::do_builtin(`
`809`	`809`
`810`	`810`	`dest=type_exprt(typet(base_name));`
`811`	`811`	`}`
`812`		`- else if(has_prefix(id2string(base_name), "constant_infinity"))`
	`812`	`+ else if(base_name.starts_with("constant_infinity"))`
`813`	`813`	`{`
`814`	`814`	`// ok, but type missing`
`815`	`815`	`dest=exprt(ID_infinity, size_type());`
Original file line number	Diff line number	Diff line change
`@@ -726,7 +726,7 @@ bool compilet::add_written_cprover_symbols(const symbol_tablet &symbol_table)`
`726`	`726`	`{`
`727`	`727`	`const irep_idt &name=pair.second.name;`
`728`	`728`	`const typet &new_type=pair.second.type;`
`729`		`- if(!(has_prefix(id2string(name), CPROVER_PREFIX) && new_type.id()==ID_code))`
	`729`	`+ if(!(name.starts_with(CPROVER_PREFIX) && new_type.id() == ID_code))`
`730`	`730`	`continue;`
`731`	`731`
`732`	`732`	`bool inserted;`
Original file line number	Diff line number	Diff line change
`@@ -1019,7 +1019,7 @@ code_blockt recursive_initializationt::build_function_pointer_constructor(`
`1019`	`1019`	`: "";`
`1020`	`1020`	`// skip referencing globals because the corresponding symbols in the symbol`
`1021`	`1021`	`// table are no longer marked as file local.`
`1022`		`- if(has_prefix(id2string(sym_to_lookup), FILE_LOCAL_PREFIX))`
	`1022`	`+ if(sym_to_lookup.starts_with(FILE_LOCAL_PREFIX))`
`1023`	`1023`	`{`
`1024`	`1024`	`continue;`
`1025`	`1025`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ void branch(`
`24`	`24`	`Forall_goto_functions(f_it, goto_model.goto_functions)`
`25`	`25`	`{`
`26`	`26`	`// don't instrument our internal functions`
`27`		`- if(has_prefix(id2string(f_it->first), CPROVER_PREFIX))`
	`27`	`+ if(f_it->first.starts_with(CPROVER_PREFIX))`
`28`	`28`	`continue;`
`29`	`29`
`30`	`30`	`// don't instrument the function to be called,`
Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ void print_global_state_size(const goto_modelt &goto_model)`
`185`	`185`	`if(`
`186`	`186`	`symbol.is_type \|\| symbol.is_macro \|\| symbol.type.id() == ID_code \|\|`
`187`	`187`	`symbol.type.get_bool(ID_C_constant) \|\|`
`188`		`- has_prefix(id2string(symbol.name), CPROVER_PREFIX) \|\|`
	`188`	`+ symbol.name.starts_with(CPROVER_PREFIX) \|\|`
`189`	`189`	`(has_initialize && initialized.find(symbol.name) == initialized.end()))`
`190`	`190`	`{`
`191`	`191`	`continue;`