From ecc2da8efdc07cf01163b7ab6db1f6dc2f134b67 Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Mon, 20 Jul 2009 21:38:26 +0000 Subject: [PATCH] Simplify the code in DarwinTargetAsmInfo::emitUsedDirectiveFor so that humans can understand it. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@76480 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/MachOWriter.cpp | 1 - lib/Target/DarwinTargetAsmInfo.cpp | 32 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/lib/CodeGen/MachOWriter.cpp b/lib/CodeGen/MachOWriter.cpp index 4e24c7c2bb0..a6a439a226a 100644 --- a/lib/CodeGen/MachOWriter.cpp +++ b/lib/CodeGen/MachOWriter.cpp @@ -774,4 +774,3 @@ MachOSym::MachOSym(const GlobalValue *gv, std::string name, uint8_t sect, } } // end namespace llvm - diff --git a/lib/Target/DarwinTargetAsmInfo.cpp b/lib/Target/DarwinTargetAsmInfo.cpp index 3eb3d535954..6540edd97ae 100644 --- a/lib/Target/DarwinTargetAsmInfo.cpp +++ b/lib/Target/DarwinTargetAsmInfo.cpp @@ -107,23 +107,23 @@ DarwinTargetAsmInfo::DarwinTargetAsmInfo(const TargetMachine &TM) /// emitUsedDirectiveFor - On Darwin, internally linked data beginning with /// the PrivateGlobalPrefix or the LessPrivateGlobalPrefix does not have the /// directive emitted (this occurs in ObjC metadata). -bool -DarwinTargetAsmInfo::emitUsedDirectiveFor(const GlobalValue* GV, - Mangler *Mang) const { - if (GV==0) - return false; +bool DarwinTargetAsmInfo::emitUsedDirectiveFor(const GlobalValue* GV, + Mangler *Mang) const { + if (!GV) return false; - /// FIXME: WHAT IS THIS? - - if (GV->hasLocalLinkage() && !isa(GV) && - ((strlen(getPrivateGlobalPrefix()) != 0 && - Mang->getMangledName(GV).substr(0,strlen(getPrivateGlobalPrefix())) == - getPrivateGlobalPrefix()) || - (strlen(getLessPrivateGlobalPrefix()) != 0 && - Mang->getMangledName(GV).substr(0, - strlen(getLessPrivateGlobalPrefix())) == - getLessPrivateGlobalPrefix()))) - return false; + // Check whether the mangled name has the "Private" or "LessPrivate" prefix. + if (GV->hasLocalLinkage() && !isa(GV)) { + const std::string &Name = Mang->getMangledName(GV); + const char *PGPrefix = getPrivateGlobalPrefix(); + const char *LPGPrefix = getLessPrivateGlobalPrefix(); + unsigned PGPLen = strlen(PGPrefix); + unsigned LPGPLen = strlen(LPGPrefix); + + if ((PGPLen != 0 && Name.substr(0, PGPLen) == PGPrefix) || + (LPGPLen != 0 && Name.substr(0, LPGPLen) == LPGPrefix)) + return false; + } + return true; } -- 2.34.1