Temporary fix to enable if-then-else simplifications

Partially reverts 199d4cc, which accidentially disabled
simplifications that require incomplete instructions to
be marked GOTO.

Author: peterschrammel

jbmc/regression/jbmc/JumpSimplification/test.desc

@@ -1,4 +1,4 @@
-KNOWNBUG
+CORE
 Test.class
 --show-goto-functions --function Test.foo
 activate-multi-line-match

src/goto-programs/goto_convert.cpp

@@ -1460,8 +1460,10 @@ void goto_convertt::convert_goto(
   const codet &code,
   goto_programt &dest)
 {
-  // this instruction will turn into a goto during post-processing
-  goto_programt::targett t=dest.add_instruction(NO_INSTRUCTION_TYPE);
+  // this instruction will be completed during post-processing
+  // it is required to mark this as GOTO in order to enable
+  // simplifications in generate_ifthenelse
+  goto_programt::targett t = dest.add_instruction(GOTO);
   t->source_location=code.source_location();
   t->code=code;