1 files changed, 8 insertions, 4 deletions

diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c
index b44132ead95a..59b0115de30a 100644
--- a/tools/perf/util/probe-finder.c
+++ b/tools/perf/util/probe-finder.c
@@ -429,12 +429,20 @@ static void convert_variable_fields(Dwarf_Die *vr_die, const char *varname,
                 if (die_get_real_type(&type, &type) == NULL)
                         die("Failed to get a type information of %s.", varname);
 
+                /* Verify it is a data structure  */
+                if (dwarf_tag(&type) != DW_TAG_structure_type)
+                        die("%s is not a data structure.", varname);
+
                 ref = xzalloc(sizeof(struct kprobe_trace_arg_ref));
                 if (*ref_ptr)
                         (*ref_ptr)->next = ref;
                 else
                         *ref_ptr = ref;
         } else {
+                /* Verify it is a data structure  */
+                if (dwarf_tag(&type) != DW_TAG_structure_type)
+                        die("%s is not a data structure.", varname);
+
                 if (field->ref)
                         die("Semantic error: %s must be referred by '.'",
                             field->name);
@@ -442,10 +450,6 @@ static void convert_variable_fields(Dwarf_Die *vr_die, const char *varname,
                         die("Structure on a register is not supported yet.");
         }
 
-        /* Verify it is a data structure  */
-        if (dwarf_tag(&type) != DW_TAG_structure_type)
-                die("%s is not a data structure.", varname);
-
         if (die_find_member(&type, field->name, &member) == NULL)
                 die("%s(tyep:%s) has no member %s.", varname,
                     dwarf_diename(&type), field->name);