Java checkcast: fix stack when check disabled

smowton · smowton · commit fa1e3d215774 · 2017-03-03T09:46:34.000Z
The checkcast instruction should always return the pointer it
checked, even when we're not generating an assert in the case that
it failed.
diff --git a/src/java_bytecode/java_bytecode_convert_method.cpp b/src/java_bytecode/java_bytecode_convert_method.cpp
@@ -980,10 +980,11 @@ codet java_bytecode_convert_methodt::convert_instructions(
         c=code_assertt(check);
         c.add_source_location().set_comment("Dynamic cast check");
         c.add_source_location().set_property_class("bad-dynamic-cast");
-        results[0]=op[0];
       }
       else
         c=code_skipt();
+
+      results[0]=op[0];
     }
     else if(statement=="invokedynamic")
     {

Original file line number	Diff line number	Diff line change
`@@ -980,10 +980,11 @@ codet java_bytecode_convert_methodt::convert_instructions(`
`980`	`980`	`c=code_assertt(check);`
`981`	`981`	`c.add_source_location().set_comment("Dynamic cast check");`
`982`	`982`	`c.add_source_location().set_property_class("bad-dynamic-cast");`
`983`		`- results[0]=op[0];`
`984`	`983`	`}`
`985`	`984`	`else`
`986`	`985`	`c=code_skipt();`
	`986`	`+`
	`987`	`+ results[0]=op[0];`
`987`	`988`	`}`
`988`	`989`	`else if(statement=="invokedynamic")`
`989`	`990`	`{`