@@ -1160,7 +1160,6 @@ code_blockt java_bytecode_convert_methodt::convert_instructions(
1160
1160
string2integer (
1161
1161
std::string (id2string (statement), statement.size ()-1 , 1 )),
1162
1162
java_int_type ());
1163
- statement=std::string (id2string (statement), 0 , statement.size ()-2 );
1164
1163
}
1165
1164
1166
1165
typet catch_type;
@@ -1288,7 +1287,8 @@ code_blockt java_bytecode_convert_methodt::convert_instructions(
1288
1287
assert (op.size ()==3 && results.empty ());
1289
1288
c = convert_astore (statement, op, i_it->source_location );
1290
1289
}
1291
- else if (statement==patternt (" ?store" ))
1290
+ else if (
1291
+ statement == patternt (" ?store" ) || statement == patternt (" ?store_?" ))
1292
1292
{
1293
1293
// store value into some local variable
1294
1294
PRECONDITION (op.size () == 1 && results.empty ());
@@ -1300,7 +1300,7 @@ code_blockt java_bytecode_convert_methodt::convert_instructions(
1300
1300
PRECONDITION (op.size () == 2 && results.size () == 1 );
1301
1301
results[0 ] = convert_aload (statement, op);
1302
1302
}
1303
- else if (statement== patternt (" ?load" ))
1303
+ else if (statement == patternt (" ?load" ) || statement == patternt ( " ?load_? " ))
1304
1304
{
1305
1305
// load a value from a local variable
1306
1306
results[0 ]=
@@ -1355,7 +1355,7 @@ code_blockt java_bytecode_convert_methodt::convert_instructions(
1355
1355
assert (results.size ()==1 );
1356
1356
results[0 ]=from_integer (-1 , java_int_type ());
1357
1357
}
1358
- else if (statement== patternt (" ?const " ))
1358
+ else if (statement == patternt (" ?const_? " ))
1359
1359
{
1360
1360
assert (results.size ()==1 );
1361
1361
results = convert_const (statement, to_constant_expr (arg0), results);
0 commit comments