[mc] Fix compile_warnings

[simgrid.git] / testsuite / mc / dwarf.c

diff --git a/testsuite/mc/dwarf.c b/testsuite/mc/dwarf.c
index 1d8ac45..b373c1f 100644 (file)
--- a/testsuite/mc/dwarf.c
+++ b/testsuite/mc/dwarf.c
@@ -59,7 +59,7 @@ static dw_variable_t find_local_variable(dw_frame_t frame, const char* argument_
   return NULL;
 }
 
-static void test_local_argument(mc_object_info_t info, const char* function, const char* variable, void* address, unw_cursor_t* cursor) {
+static void test_local_variable(mc_object_info_t info, const char* function, const char* variable, void* address, unw_cursor_t* cursor) {
   dw_frame_t subprogram = find_function_by_name(info, function);
   assert(subprogram);
   // TODO, Lookup frame by IP and test against name instead
@@ -68,7 +68,8 @@ static void test_local_argument(mc_object_info_t info, const char* function, con
   assert(var);
 
   void* frame_base = mc_find_frame_base(subprogram, cursor);
-  assert((void*)mc_dwarf_resolve_locations(&var->locations, cursor, frame_base) == address);
+  xbt_assert((void*)mc_dwarf_resolve_locations(&var->locations, cursor, frame_base, NULL) == address,
+    "Bad resolution of local variable %s of %s", variable, function);
 
 }
 
@@ -86,7 +87,7 @@ static dw_variable_t test_global_variable(mc_object_info_t info, const char* nam
   return variable;
 }
 
-static dw_type_t find_type(mc_object_info_t info, const char* name, dw_type_t type) {
+static dw_type_t find_member(mc_object_info_t info, const char* name, dw_type_t type) {
   unsigned int cursor = 0;
   dw_type_t member;
   xbt_dynar_foreach(type->members, cursor, member){
@@ -98,6 +99,12 @@ static dw_type_t find_type(mc_object_info_t info, const char* name, dw_type_t ty
 
 int some_local_variable = 0;
 
+typedef struct foo {int i;} s_foo;
+
+static void test_type_by_name(s_foo my_foo) {
+  assert(xbt_dict_get_or_null(mc_binary_info->full_types_by_name, "struct foo"));
+}
+
 int main(int argc, char** argv) {
 
   // xbt_init(&argc, argv);
@@ -116,8 +123,8 @@ int main(int argc, char** argv) {
 
   var = test_global_variable(mc_binary_info, "test_some_struct", &test_some_struct, sizeof(test_some_struct));
   type = xbt_dict_get_or_null(mc_binary_info->types, var->type_origin);
-  assert(find_type(mc_binary_info, "first", type)->offset == 0);
-  assert(find_type(mc_binary_info, "second", type)->offset
+  assert(find_member(mc_binary_info, "first", type)->offset == 0);
+  assert(find_member(mc_binary_info, "second", type)->offset
       == ((const char*)&test_some_struct.second) - (const char*)&test_some_struct);
 
   unw_context_t context;
@@ -125,7 +132,10 @@ int main(int argc, char** argv) {
   unw_getcontext(&context);
   unw_init_local(&cursor, &context);
 
-  test_local_argument(mc_binary_info, "main", "argc", &argc, &cursor);
+  test_local_variable(mc_binary_info, "main", "argc", &argc, &cursor);
+
+  s_foo my_foo;
+  test_type_by_name(my_foo);
 
   _exit(0);
 }