Revert "parsert is not a messaget"

This reverts commit 8e0767f9f040f18b4518d4696405abc3379004ab.

Author: tautschnig

jbmc/src/java_bytecode/java_bytecode_parser.cpp

@@ -2048,8 +2048,7 @@ void java_bytecode_parsert::read_bootstrapmethods_entry()
       log.debug() << "format of BootstrapMethods entry not recognized: extra "
                      "arguments of wrong type"
                   << messaget::eom;
-      store_unknown_method_handle(
-        parsed_class, bootstrap_method_index, std::move(u2_values));
+      store_unknown_method_handle(bootstrap_method_index);
       continue;
     }
 
@@ -2067,8 +2066,7 @@ void java_bytecode_parsert::read_bootstrapmethods_entry()
         << "format of BootstrapMethods entry not recognized: arguments "
            "wrong type"
         << messaget::eom;
-      store_unknown_method_handle(
-        parsed_class, bootstrap_method_index, std::move(u2_values));
+      store_unknown_method_handle(bootstrap_method_index);
       continue;
     }
 
@@ -2081,8 +2079,7 @@ void java_bytecode_parsert::read_bootstrapmethods_entry()
       log.debug() << "format of BootstrapMethods entry not recognized: method "
                      "handle not recognised"
                   << messaget::eom;
-      store_unknown_method_handle(
-        parsed_class, bootstrap_method_index, std::move(u2_values));
+      store_unknown_method_handle(bootstrap_method_index);
       continue;
     }
 

src/util/parser.cpp

@@ -35,7 +35,6 @@ void parsert::parse_error(
   if(!before.empty())
     tmp += " before '" + before + "'";
 
-<<<<<<< HEAD
 #if 0
   source_locationt tmp_source_location=source_location;
   tmp_source_location.set_column(column-before.size());
@@ -44,8 +43,4 @@ void parsert::parse_error(
   log.error().source_location = source_location;
   log.error() << tmp << messaget::eom;
 #endif
-=======
-  log.error().source_location = source_location;
-  log.error() << tmp << messaget::eom;
->>>>>>> parsert is not a messaget
 }