Bug Fix: Wrong First Breakpoint in Clang

Author: Theldus

src/analysis.c

@@ -626,7 +626,7 @@ void static_analysis_finish(void)
  * does, but in a 'smarter' way.
  */
 struct hashtable *static_analysis(const char *file, const char *func,
-	struct array *lines_l)
+	struct array *lines_l, uint64_t firstbreak)
 {
 	char *file_cur;
 	struct dw_line *line;
@@ -650,15 +650,15 @@ struct hashtable *static_analysis(const char *file, const char *func,
 	/* Initialize breakpoint hashtable. */
 	hashtable_init(&breakpoints, NULL);
 
-	/* First line. */
-	line = array_get(&lines_l, 0, NULL);
-	func_line_start = line->line_no;
-
-	/* Allocate our first breakpoint. */
+	/*
+	 * Allocate our first breakpoint to the first function
+	 * instruction. Since this is an special case, there is
+	 * no need to known the line number.
+	 */
 	b = malloc(sizeof(struct breakpoint));
-	b->addr = line->addr;
+	b->addr = firstbreak;
 	b->original_byte = 0;
-	b->line_no = line->line_no;
+	b->line_no = 0;
 
 	/*
 	 * Set our first breakpoint to the very

src/include/analysis.h

@@ -52,7 +52,8 @@
 	extern struct hashtable *static_analysis(
 		const char *file,
 		const char *func,
-		struct array *lines);
+		struct array *lines,
+		uint64_t firstbreak);
 
 
 #endif /* ANALYSIS_H */

src/main.c

@@ -198,7 +198,7 @@ void do_analysis(const char *file, const char *function, char **argv)
 	 * - Static analysis
 	 */
 	breakpoints = (args.flags & FLG_STATIC_ANALYSIS) ?
-		static_analysis(filename, function, lines) :
+		static_analysis(filename, function, lines, dw.dw_func.low_pc) :
 		bp_createlist(lines);
 
 	/* Insert them. */
@@ -372,7 +372,7 @@ static void dump_all(const char *prg_name)
 	/* Break point list. */
 	printf("\nBreakpoint list:\n");
 	breakpoints = (args.flags & FLG_STATIC_ANALYSIS) ?
-		static_analysis(filename, args.function, lines) :
+		static_analysis(filename, args.function, lines, dw.dw_func.low_pc) :
 		bp_createlist(lines);
 
 	i = 0;

src/tests/run-tests.sh

@@ -99,6 +99,8 @@ then
 		echo -e " [${RED}NOT PASSED${NC}] (normal analysis differ from expected output)"
 		exit 1
 	fi
+else
+	echo -e " [${RED}NOT PASSED${NC}] (execution error)"
 fi
 
 # Run static analysis tests