diff --git a/src/Common/Dwarf.cpp b/src/Common/Dwarf.cpp
index d0b3244dac2..18e9315d5c3 100644
--- a/src/Common/Dwarf.cpp
+++ b/src/Common/Dwarf.cpp
@@ -804,7 +804,7 @@ bool Dwarf::findLocation(
         findSubProgramDieForAddress(cu, die, address, base_addr_cu, subprogram);
 
         // Subprogram is the DIE of caller function.
-        if (check_inline && subprogram.abbr.has_children)
+        if (/*check_inline &&*/ subprogram.abbr.has_children)
         {
             // Use an extra location and get its call file and call line, so that
             // they can be used for the second last location when we don't have
@@ -832,7 +832,7 @@ bool Dwarf::findLocation(
                 // file+line of the non-inlined outer function making the call.
                 // locationInfo.name is already set by the caller by looking up the
                 // non-inlined function @address belongs to.
-                info.has_file_and_line = true;
+                info.has_file_and_line = true; //-V1048
                 info.file = call_locations[0].file;
                 info.line = call_locations[0].line;
 
diff --git a/src/Common/Dwarf.h b/src/Common/Dwarf.h
index 9ea940c3380..4712daad28c 100644
--- a/src/Common/Dwarf.h
+++ b/src/Common/Dwarf.h
@@ -121,7 +121,7 @@ public:
     struct CallLocation
     {
         Path file = {};
-        uint64_t line;
+        uint64_t line = 0;
         std::string_view name;
     };
 
@@ -202,8 +202,8 @@ private:
     // Abbreviation for a Debugging Information Entry.
     struct DIEAbbreviation
     {
-        uint64_t code;
-        uint64_t tag;
+        uint64_t code = 0;
+        uint64_t tag = 0;
         bool has_children = false;
 
         std::string_view attributes;