Preserve and prefer exact DWARF function types ##analysis

Author: radare

libr/anal/dwarf_process.c

@@ -2,6 +2,7 @@
 
 #include <ctype.h>
 #include <r_anal.h>
+#include <r_anal_priv.h>
 #include <r_bin_dwarf.h>
 
 typedef struct dwarf_parse_context_t {
@@ -13,6 +14,7 @@ typedef struct dwarf_parse_context_t {
 	HtUP/*<offset, RBinDwarfLocList*>*/  *locations;
 	const char *lang; // for demangling
 	RArena *arena;
+	Sdb *pass_sdb;
 } Context;
 
 typedef struct dwarf_function_t {
@@ -1614,14 +1616,18 @@ static bool dwarf_function_type_matches(Sdb *types, const char *name, const char
 	return true;
 }
 
-static char *dwarf_function_type_name(Context *ctx, const char *sname, const Function *dwarf_fcn, const char *ret_type, RList/*<Variable*>*/ *variables, bool has_unspecified_parameters) {
+static char *dwarf_function_type_name(Context *ctx, const char *sname, const Function *dwarf_fcn, const char *ret_type, RList/*<Variable*>*/ *variables, bool has_unspecified_parameters, bool seen_in_pass) {
 	R_RETURN_VAL_IF_FAIL (ctx && ctx->anal && sname && dwarf_fcn && ret_type && variables, NULL);
 	Sdb *types = ctx->anal->sdb_types;
 	const char *previous_name = sdb_const_getf (ctx->sdb, NULL, "fcn.%s.name", sname);
 	const char *previous = sdb_const_getf (ctx->sdb, NULL, "fcn.%s.typed_name", sname);
 	const ut64 previous_addr = sdb_num_getf (ctx->sdb, NULL, "fcn.%s.addr", sname);
 	if (previous_name && !strcmp (previous_name, dwarf_fcn->name)
-		&& previous && previous_addr == dwarf_fcn->addr) {
+		&& previous && previous_addr == dwarf_fcn->addr
+		&& (!seen_in_pass
+			|| dwarf_function_type_matches (types, previous, ret_type,
+				variables, has_unspecified_parameters)
+			|| sdb_const_getf (ctx->pass_sdb, NULL, "type.%s.quality", previous))) {
 		return strdup (previous);
 	}
 	char *name = sanitize_c_identifier (dwarf_fcn->name);
@@ -1731,6 +1737,8 @@ static void import_dwarf_function_type(Context *ctx, const char *sname, const ch
 	sdb_setf (ctx->sdb, csig, 0, "fcn.%s.csig", sname);
 	r_strbuf_fini (&args_buf);
 
+	const char *pass_quality = sdb_const_getf (ctx->pass_sdb, NULL,
+		"type.%s.quality", typed_name);
 	const bool type_existed = !!sdb_const_get (anal->sdb_types, typed_name, 0);
 	if (!type_existed) {
 		/* Only attempt C parsing for C-like languages.  Non-C languages
@@ -1759,21 +1767,28 @@ static void import_dwarf_function_type(Context *ctx, const char *sname, const ch
 		if (!r_type_func_exist (anal->sdb_types, typed_name)) {
 			(void)import_dwarf_function_fallback (anal, typed_name, ret_type, variables, has_unspecified_parameters);
 		}
+		if (r_type_func_exist (anal->sdb_types, typed_name)) {
+			sdb_setf (ctx->pass_sdb, dwarf_fcn->prototype_complete? "complete": "incomplete", 0,
+				"type.%s.quality", typed_name);
+		}
+	} else if (pass_quality && !strcmp (pass_quality, "incomplete")
+		&& dwarf_fcn->prototype_complete
+		&& !dwarf_function_type_matches (anal->sdb_types, typed_name,
+			ret_type, variables, has_unspecified_parameters)) {
+		/* Only a function record created by an inferior DIE in this pass is
+		   replaceable. Registered and prior-pass types remain untouched. */
+		(void)r_anal_function_del_signature (anal, typed_name);
+		(void)import_dwarf_function_fallback (anal, typed_name, ret_type, variables, has_unspecified_parameters);
+		sdb_setf (ctx->pass_sdb, "complete", 0, "type.%s.quality", typed_name);
+	} else if (pass_quality && dwarf_fcn->prototype_complete) {
+		sdb_setf (ctx->pass_sdb, "complete", 0, "type.%s.quality", typed_name);
 	}
 	const bool type_matches = dwarf_fcn->prototype_complete
 		&& dwarf_function_type_matches (anal->sdb_types, typed_name,
 			ret_type, variables, has_unspecified_parameters);
-	const char *linked = sdb_const_getf (anal->sdb_types, NULL,
-		"fcnlink.%08" PFMT64x, dwarf_fcn->addr);
 	if (type_matches) {
 		sdb_setf (anal->sdb_types, typed_name, 0,
 			"fcnlink.%08" PFMT64x, dwarf_fcn->addr);
-	} else if (linked && !strcmp (linked, typed_name)) {
-		char *link_key = r_str_newf ("fcnlink.%08" PFMT64x, dwarf_fcn->addr);
-		if (link_key) {
-			sdb_unset (anal->sdb_types, link_key, 0);
-		}
-		free (link_key);
 	}
 	free (csig);
 }
@@ -1787,8 +1802,25 @@ static void sdb_save_dwarf_function(Context *ctx, Function *dwarf_fcn, const cha
 		free (real_name);
 		return;
 	}
+	const char *pass_name = sdb_const_getf (ctx->pass_sdb, NULL,
+		"fcn.%08" PFMT64x ".%s.name", dwarf_fcn->addr, sname);
+	const bool seen_in_pass = pass_name && !strcmp (pass_name, real_name);
+	const char *pass_quality = seen_in_pass
+		? sdb_const_getf (ctx->pass_sdb, NULL,
+			"fcn.%08" PFMT64x ".%s.quality", dwarf_fcn->addr, sname)
+		: NULL;
+	if (pass_quality && (!strcmp (pass_quality, "complete")
+			|| !dwarf_fcn->prototype_complete)) {
+		free (real_name);
+		free (sname);
+		return;
+	}
+	sdb_setf (ctx->pass_sdb, real_name, 0,
+		"fcn.%08" PFMT64x ".%s.name", dwarf_fcn->addr, sname);
+	sdb_setf (ctx->pass_sdb, dwarf_fcn->prototype_complete? "complete": "incomplete", 0,
+		"fcn.%08" PFMT64x ".%s.quality", dwarf_fcn->addr, sname);
 	char *typed_name = dwarf_function_type_name (ctx, sname, dwarf_fcn,
-		ret_type, variables, has_unspecified_parameters);
+		ret_type, variables, has_unspecified_parameters, seen_in_pass);
 	sdb_set (sdb, sname, "fcn", 0);
 
 	char *addr_val = r_str_newf ("0x%" PFMT64x, dwarf_fcn->addr);
@@ -2105,8 +2137,13 @@ static void parse_type_entry(Context *ctx, ut64 idx) {
  */
 R_API void r_anal_dwarf_process_info(const RAnal *anal, RAnalDwarfContext *ctx) {
 	R_RETURN_IF_FAIL (ctx && anal);
+	r_anal_types_ensure_loaded ((RAnal *)anal);
 	Sdb *dwarf_sdb = sdb_ns (anal->sdb, "dwarf", 1);
 	sdb_unset_like (anal->sdb_types, "fcnlink.*");
+	Sdb *pass_sdb = sdb_new0 ();
+	if (!pass_sdb) {
+		return;
+	}
 
 	const RBinDwarfDebugInfo *info = ctx->info;
 	const RBinDwarfCompUnit *unit;
@@ -2120,13 +2157,15 @@ R_API void r_anal_dwarf_process_info(const RAnal *anal, RAnalDwarfContext *ctx)
 			.sdb = dwarf_sdb,
 			.locations = ctx->loc,
 			.lang = NULL,
-			.arena = arena
+			.arena = arena,
+			.pass_sdb = pass_sdb
 		};
 		R_VEC_FOREACH_I (unit->dies, j) {
 			parse_type_entry (&dw_context, j);
 		}
 	}
 	r_arena_free (arena);
+	sdb_free (pass_sdb);
 }
 
 bool filter_sdb_function_names(void *user, const char *k, const char *v) {