diff options
| -rw-r--r-- | llvm/tools/llvm-nm/llvm-nm.cpp | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/llvm/tools/llvm-nm/llvm-nm.cpp b/llvm/tools/llvm-nm/llvm-nm.cpp index 7e257d8ce89..21f3a2bade5 100644 --- a/llvm/tools/llvm-nm/llvm-nm.cpp +++ b/llvm/tools/llvm-nm/llvm-nm.cpp @@ -1181,8 +1181,7 @@ dumpSymbolNamesFromObject(SymbolicFile &Obj, bool printName, // see if this symbol is a symbol from that section and if not skip it. if (Nsect && Nsect != getNsectInMachO(*MachO, Sym)) continue; - NMSymbol S; - memset(&S, '\0', sizeof(S)); + NMSymbol S = {}; S.Size = 0; S.Address = 0; if (PrintSize) { @@ -1276,8 +1275,7 @@ dumpSymbolNamesFromObject(SymbolicFile &Obj, bool printName, } } if (!found) { - NMSymbol S; - memset(&S, '\0', sizeof(NMSymbol)); + NMSymbol S = {}; S.Address = Entry.address() + BaseSegmentAddress; S.Size = 0; S.TypeChar = '\0'; @@ -1367,8 +1365,7 @@ dumpSymbolNamesFromObject(SymbolicFile &Obj, bool printName, // Now create the undefined symbol using the referened dynamic // library. - NMSymbol U; - memset(&U, '\0', sizeof(NMSymbol)); + NMSymbol U = {}; U.Address = 0; U.Size = 0; U.TypeChar = 'U'; @@ -1434,8 +1431,7 @@ dumpSymbolNamesFromObject(SymbolicFile &Obj, bool printName, } if (!found) { LastSymbolName = Entry.symbolName(); - NMSymbol B; - memset(&B, '\0', sizeof(NMSymbol)); + NMSymbol B = {}; B.Address = 0; B.Size = 0; B.TypeChar = 'U'; @@ -1494,8 +1490,7 @@ dumpSymbolNamesFromObject(SymbolicFile &Obj, bool printName, } if (!found) { LastSymbolName = Entry.symbolName(); - NMSymbol L; - memset(&L, '\0', sizeof(NMSymbol)); + NMSymbol L = {}; L.Name = Entry.symbolName(); L.Address = 0; L.Size = 0; @@ -1633,9 +1628,8 @@ dumpSymbolNamesFromObject(SymbolicFile &Obj, bool printName, } // See this address is not already in the symbol table fake up an // nlist for it. - if (!found) { - NMSymbol F; - memset(&F, '\0', sizeof(NMSymbol)); + if (!found) { + NMSymbol F = {}; F.Name = "<redacted function X>"; F.Address = FoundFns[f] + BaseSegmentAddress; F.Size = 0; @@ -1902,7 +1896,6 @@ static void dumpSymbolNamesFromFile(std::string &Filename) { if (HostArchName == I->getArchFlagName()) { Expected<std::unique_ptr<ObjectFile>> ObjOrErr = I->getAsObjectFile(); std::string ArchiveName; - ArchiveName.clear(); if (ObjOrErr) { ObjectFile &Obj = *ObjOrErr.get(); dumpSymbolNamesFromObject(Obj, false); |
