Fix for merge conflict

Owen Jones · marek-trtik · commit 84cbc6994ee3 · 2018-08-28T15:39:15.000+01:00
diff --git a/src/taint-instrumenter/instrumentation_props.cpp b/src/taint-instrumenter/instrumentation_props.cpp
@@ -185,7 +185,7 @@ taint_instrumentation_propst::taint_instrumentation_propst(
         }
 
         const symbolt *function_symbol =
-          program.get_symbol_table().lookup(fn_vec.first);
+          program.get_symbol_table().lookup(fn_map.first);
         location_props.push_back(
           {rid_and_map.first,
            fn_map.first,

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ taint_instrumentation_propst::taint_instrumentation_propst(`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`const symbolt *function_symbol =`
`188`		`- program.get_symbol_table().lookup(fn_vec.first);`
	`188`	`+ program.get_symbol_table().lookup(fn_map.first);`
`189`	`189`	`location_props.push_back(`
`190`	`190`	`{rid_and_map.first,`
`191`	`191`	`fn_map.first,`