Merge pull request #1690 from hannes-steffenhagen-diffblue/goto_analyzer_develop-original_goto_location_fix

Fix usage of instruction source location

Author: hannes-steffenhagen-diffblue

regression/goto-instrument/store_goto_locations_json/main.c

@@ -0,0 +1,4 @@
+int main(void)
+{
+  return 0;
+}

regression/goto-instrument/store_goto_locations_json/test.desc

@@ -0,0 +1,12 @@
+CORE
+main.c
+--show-goto-functions --json-ui --store-goto-locations
+^EXIT=0$
+^SIGNAL=0$
+\"originalGOTOLocation\": \"0\"
+--
+--
+
+Checks that generated JSON contains
+original goto locations, if any
+

src/goto-programs/show_goto_functions_json.cpp

@@ -63,15 +63,16 @@ json_objectt show_goto_functions_jsont::convert(
         instruction_entry["instructionId"]=
           json_stringt(instruction.to_string());
 
-        if(instruction.code.source_location().is_not_nil())
+        if(instruction.source_location.is_not_nil())
         {
           instruction_entry["sourceLocation"]=
-            json(instruction.code.source_location());
+            json(instruction.source_location);
 
-          if(instruction.code.source_location().get_goto_location()!="")
+          if(!instruction.source_location.get_goto_location().empty())
           {
             instruction_entry["originalGOTOLocation"]=
-              json_stringt(id2string(instruction.code.source_location().get_goto_location()));
+              json_stringt(
+                id2string(instruction.source_location.get_goto_location()));
           }
         }