Skip to content

Commit 39ef927

Browse files
committed
Revert "parsert is not a messaget"
This reverts commit 8e0767f9f040f18b4518d4696405abc3379004ab.
1 parent b709fa9 commit 39ef927

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
lines changed

jbmc/src/java_bytecode/java_bytecode_parser.cpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2048,8 +2048,7 @@ void java_bytecode_parsert::read_bootstrapmethods_entry()
20482048
log.debug() << "format of BootstrapMethods entry not recognized: extra "
20492049
"arguments of wrong type"
20502050
<< messaget::eom;
2051-
store_unknown_method_handle(
2052-
parsed_class, bootstrap_method_index, std::move(u2_values));
2051+
store_unknown_method_handle(bootstrap_method_index);
20532052
continue;
20542053
}
20552054

@@ -2067,8 +2066,7 @@ void java_bytecode_parsert::read_bootstrapmethods_entry()
20672066
<< "format of BootstrapMethods entry not recognized: arguments "
20682067
"wrong type"
20692068
<< messaget::eom;
2070-
store_unknown_method_handle(
2071-
parsed_class, bootstrap_method_index, std::move(u2_values));
2069+
store_unknown_method_handle(bootstrap_method_index);
20722070
continue;
20732071
}
20742072

@@ -2081,8 +2079,7 @@ void java_bytecode_parsert::read_bootstrapmethods_entry()
20812079
log.debug() << "format of BootstrapMethods entry not recognized: method "
20822080
"handle not recognised"
20832081
<< messaget::eom;
2084-
store_unknown_method_handle(
2085-
parsed_class, bootstrap_method_index, std::move(u2_values));
2082+
store_unknown_method_handle(bootstrap_method_index);
20862083
continue;
20872084
}
20882085

src/util/parser.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ void parsert::parse_error(
3535
if(!before.empty())
3636
tmp += " before '" + before + "'";
3737

38-
<<<<<<< HEAD
3938
#if 0
4039
source_locationt tmp_source_location=source_location;
4140
tmp_source_location.set_column(column-before.size());
@@ -44,8 +43,4 @@ void parsert::parse_error(
4443
log.error().source_location = source_location;
4544
log.error() << tmp << messaget::eom;
4645
#endif
47-
=======
48-
log.error().source_location = source_location;
49-
log.error() << tmp << messaget::eom;
50-
>>>>>>> parsert is not a messaget
5146
}

0 commit comments

Comments
 (0)