File tree Expand file tree Collapse file tree 2 files changed +3
-11
lines changed Expand file tree Collapse file tree 2 files changed +3
-11
lines changed Original file line number Diff line number Diff line change @@ -2048,8 +2048,7 @@ void java_bytecode_parsert::read_bootstrapmethods_entry()
2048
2048
log.debug () << " format of BootstrapMethods entry not recognized: extra "
2049
2049
" arguments of wrong type"
2050
2050
<< 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);
2053
2052
continue ;
2054
2053
}
2055
2054
@@ -2067,8 +2066,7 @@ void java_bytecode_parsert::read_bootstrapmethods_entry()
2067
2066
<< " format of BootstrapMethods entry not recognized: arguments "
2068
2067
" wrong type"
2069
2068
<< 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);
2072
2070
continue ;
2073
2071
}
2074
2072
@@ -2081,8 +2079,7 @@ void java_bytecode_parsert::read_bootstrapmethods_entry()
2081
2079
log.debug () << " format of BootstrapMethods entry not recognized: method "
2082
2080
" handle not recognised"
2083
2081
<< 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);
2086
2083
continue ;
2087
2084
}
2088
2085
Original file line number Diff line number Diff line change @@ -35,7 +35,6 @@ void parsert::parse_error(
35
35
if (!before.empty ())
36
36
tmp += " before '" + before + " '" ;
37
37
38
- <<<<<<< HEAD
39
38
#if 0
40
39
source_locationt tmp_source_location=source_location;
41
40
tmp_source_location.set_column(column-before.size());
@@ -44,8 +43,4 @@ void parsert::parse_error(
44
43
log.error ().source_location = source_location;
45
44
log.error () << tmp << messaget::eom;
46
45
#endif
47
- =======
48
- log.error ().source_location = source_location;
49
- log.error () << tmp << messaget::eom;
50
- >>>>>>> parsert is not a messaget
51
46
}
You can’t perform that action at this time.
0 commit comments