From 4136e7b90ea5ce8b4d708cdd54d0b052d520a96e Mon Sep 17 00:00:00 2001 From: Gabor Greif Date: Wed, 23 Sep 2009 02:46:12 +0000 Subject: [PATCH] pretty mechanical changes to match coding guidelines (blessed by sabre on IRC) git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@82603 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/lto/LTOModule.cpp | 82 ++++++++++++++++++++--------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/tools/lto/LTOModule.cpp b/tools/lto/LTOModule.cpp index e3a3cf637b8..e1cf48d3c84 100644 --- a/tools/lto/LTOModule.cpp +++ b/tools/lto/LTOModule.cpp @@ -37,8 +37,8 @@ using namespace llvm; bool LTOModule::isBitcodeFile(const void* mem, size_t length) { - return ( llvm::sys::IdentifyFileType((char*)mem, length) - == llvm::sys::Bitcode_FileType ); + return llvm::sys::IdentifyFileType((char*)mem, length) + == llvm::sys::Bitcode_FileType; } bool LTOModule::isBitcodeFile(const char* path) @@ -50,7 +50,7 @@ bool LTOModule::isBitcodeFileForTarget(const void* mem, size_t length, const char* triplePrefix) { MemoryBuffer* buffer = makeBuffer(mem, length); - if ( buffer == NULL ) + if (!buffer) return false; return isTargetMatch(buffer, triplePrefix); } @@ -71,12 +71,12 @@ bool LTOModule::isTargetMatch(MemoryBuffer* buffer, const char* triplePrefix) OwningPtr mp(getBitcodeModuleProvider(buffer, getGlobalContext())); // on success, mp owns buffer and both are deleted at end of this method - if ( !mp ) { + if (!mp) { delete buffer; return false; } std::string actualTarget = mp->getModule()->getTargetTriple(); - return ( strncmp(actualTarget.c_str(), triplePrefix, + return (strncmp(actualTarget.c_str(), triplePrefix, strlen(triplePrefix)) == 0); } @@ -90,7 +90,7 @@ LTOModule* LTOModule::makeLTOModule(const char* path, std::string& errMsg) { OwningPtr buffer(MemoryBuffer::getFile(path, &errMsg)); - if ( !buffer ) + if (!buffer) return NULL; return makeLTOModule(buffer.get(), errMsg); } @@ -103,8 +103,8 @@ MemoryBuffer* LTOModule::makeBuffer(const void* mem, size_t length) { const char* startPtr = (char*)mem; const char* endPtr = startPtr+length; - if ( (((uintptr_t)endPtr & (sys::Process::GetPageSize()-1)) == 0) - || (*endPtr != 0) ) + if ((((uintptr_t)endPtr & (sys::Process::GetPageSize()-1)) == 0) + || (*endPtr != 0)) return MemoryBuffer::getMemBufferCopy(startPtr, endPtr); else return MemoryBuffer::getMemBuffer(startPtr, endPtr); @@ -115,7 +115,7 @@ LTOModule* LTOModule::makeLTOModule(const void* mem, size_t length, std::string& errMsg) { OwningPtr buffer(makeBuffer(mem, length)); - if ( !buffer ) + if (!buffer) return NULL; return makeLTOModule(buffer.get(), errMsg); } @@ -148,7 +148,7 @@ LTOModule* LTOModule::makeLTOModule(MemoryBuffer* buffer, // parse bitcode buffer OwningPtr m(ParseBitcodeFile(buffer, getGlobalContext(), &errMsg)); - if ( !m ) + if (!m) return NULL; std::string Triple = m->getTargetTriple(); @@ -157,7 +157,7 @@ LTOModule* LTOModule::makeLTOModule(MemoryBuffer* buffer, // find machine architecture for this module const Target* march = TargetRegistry::lookupTarget(Triple, errMsg); - if ( march == NULL ) + if (!march) return NULL; // construct LTModule, hand over ownership of module and target @@ -196,7 +196,7 @@ bool LTOModule::objcClassNameFromExpression(Constant* c, std::string& name) if (GlobalVariable* gvn = dyn_cast(op)) { Constant* cn = gvn->getInitializer(); if (ConstantArray* ca = dyn_cast(cn)) { - if ( ca->isCString() ) { + if (ca->isCString()) { name = ".objc_class_name_" + ca->getAsString(); return true; } @@ -212,9 +212,9 @@ void LTOModule::addObjCClass(GlobalVariable* clgv) if (ConstantStruct* c = dyn_cast(clgv->getInitializer())) { // second slot in __OBJC,__class is pointer to superclass name std::string superclassName; - if ( objcClassNameFromExpression(c->getOperand(1), superclassName) ) { + if (objcClassNameFromExpression(c->getOperand(1), superclassName)) { NameAndAttributes info; - if ( _undefines.find(superclassName.c_str()) == _undefines.end() ) { + if (_undefines.find(superclassName.c_str()) == _undefines.end()) { const char* symbolName = ::strdup(superclassName.c_str()); info.name = ::strdup(symbolName); info.attributes = LTO_SYMBOL_DEFINITION_UNDEFINED; @@ -224,7 +224,7 @@ void LTOModule::addObjCClass(GlobalVariable* clgv) } // third slot in __OBJC,__class is pointer to class name std::string className; - if ( objcClassNameFromExpression(c->getOperand(2), className) ) { + if (objcClassNameFromExpression(c->getOperand(2), className)) { const char* symbolName = ::strdup(className.c_str()); NameAndAttributes info; info.name = symbolName; @@ -245,9 +245,9 @@ void LTOModule::addObjCCategory(GlobalVariable* clgv) if (ConstantStruct* c = dyn_cast(clgv->getInitializer())) { // second slot in __OBJC,__category is pointer to target class name std::string targetclassName; - if ( objcClassNameFromExpression(c->getOperand(1), targetclassName) ) { + if (objcClassNameFromExpression(c->getOperand(1), targetclassName)) { NameAndAttributes info; - if ( _undefines.find(targetclassName.c_str()) == _undefines.end() ){ + if (_undefines.find(targetclassName.c_str()) == _undefines.end()) { const char* symbolName = ::strdup(targetclassName.c_str()); info.name = ::strdup(symbolName); info.attributes = LTO_SYMBOL_DEFINITION_UNDEFINED; @@ -263,9 +263,9 @@ void LTOModule::addObjCCategory(GlobalVariable* clgv) void LTOModule::addObjCClassRef(GlobalVariable* clgv) { std::string targetclassName; - if ( objcClassNameFromExpression(clgv->getInitializer(), targetclassName) ){ + if (objcClassNameFromExpression(clgv->getInitializer(), targetclassName)) { NameAndAttributes info; - if ( _undefines.find(targetclassName.c_str()) == _undefines.end() ) { + if (_undefines.find(targetclassName.c_str()) == _undefines.end()) { const char* symbolName = ::strdup(targetclassName.c_str()); info.name = ::strdup(symbolName); info.attributes = LTO_SYMBOL_DEFINITION_UNDEFINED; @@ -300,23 +300,23 @@ void LTOModule::addDefinedDataSymbol(GlobalValue* v, Mangler& mangler) // a class was missing. // The following synthesizes the implicit .objc_* symbols for the linker // from the ObjC data structures generated by the front end. - if ( v->hasSection() /* && isTargetDarwin */ ) { + if (v->hasSection() /* && isTargetDarwin */) { // special case if this data blob is an ObjC class definition - if ( v->getSection().compare(0, 15, "__OBJC,__class,") == 0 ) { + if (v->getSection().compare(0, 15, "__OBJC,__class,") == 0) { if (GlobalVariable* gv = dyn_cast(v)) { addObjCClass(gv); } } // special case if this data blob is an ObjC category definition - else if ( v->getSection().compare(0, 18, "__OBJC,__category,") == 0 ) { + else if (v->getSection().compare(0, 18, "__OBJC,__category,") == 0) { if (GlobalVariable* gv = dyn_cast(v)) { addObjCCategory(gv); } } // special case if this data blob is the list of referenced classes - else if ( v->getSection().compare(0, 18, "__OBJC,__cls_refs,") == 0 ) { + else if (v->getSection().compare(0, 18, "__OBJC,__cls_refs,") == 0) { if (GlobalVariable* gv = dyn_cast(v)) { addObjCClassRef(gv); } @@ -346,21 +346,21 @@ void LTOModule::addDefinedSymbol(GlobalValue* def, Mangler &mangler, uint32_t attr = align ? CountTrailingZeros_32(def->getAlignment()) : 0; // set permissions part - if ( isFunction ) + if (isFunction) attr |= LTO_SYMBOL_PERMISSIONS_CODE; else { GlobalVariable* gv = dyn_cast(def); - if ( (gv != NULL) && gv->isConstant() ) + if (gv && gv->isConstant()) attr |= LTO_SYMBOL_PERMISSIONS_RODATA; else attr |= LTO_SYMBOL_PERMISSIONS_DATA; } // set definition part - if ( def->hasWeakLinkage() || def->hasLinkOnceLinkage() ) { + if (def->hasWeakLinkage() || def->hasLinkOnceLinkage()) { attr |= LTO_SYMBOL_DEFINITION_WEAK; } - else if ( def->hasCommonLinkage()) { + else if (def->hasCommonLinkage()) { attr |= LTO_SYMBOL_DEFINITION_TENTATIVE; } else { @@ -368,12 +368,12 @@ void LTOModule::addDefinedSymbol(GlobalValue* def, Mangler &mangler, } // set scope part - if ( def->hasHiddenVisibility() ) + if (def->hasHiddenVisibility()) attr |= LTO_SYMBOL_SCOPE_HIDDEN; - else if ( def->hasProtectedVisibility() ) + else if (def->hasProtectedVisibility()) attr |= LTO_SYMBOL_SCOPE_PROTECTED; - else if ( def->hasExternalLinkage() || def->hasWeakLinkage() - || def->hasLinkOnceLinkage() || def->hasCommonLinkage() ) + else if (def->hasExternalLinkage() || def->hasWeakLinkage() + || def->hasLinkOnceLinkage() || def->hasCommonLinkage()) attr |= LTO_SYMBOL_SCOPE_DEFAULT; else attr |= LTO_SYMBOL_SCOPE_INTERNAL; @@ -388,7 +388,7 @@ void LTOModule::addDefinedSymbol(GlobalValue* def, Mangler &mangler, void LTOModule::addAsmGlobalSymbol(const char *name) { // only add new define if not already defined - if ( _defines.count(name) == 0 ) + if (_defines.count(name) == 0) return; // string is owned by _defines @@ -434,7 +434,7 @@ void LTOModule::addPotentialUndefinedSymbol(GlobalValue* decl, Mangler &mangler) void LTOModule::findExternalRefs(Value* value, Mangler &mangler) { if (GlobalValue* gv = dyn_cast(value)) { - if ( !gv->hasExternalLinkage() ) + if (!gv->hasExternalLinkage()) addPotentialUndefinedSymbol(gv, mangler); // If this is a variable definition, do not recursively process // initializer. It might contain a reference to this variable @@ -442,11 +442,11 @@ void LTOModule::findExternalRefs(Value* value, Mangler &mangler) { // processed in addDefinedDataSymbol(). return; } - + // GlobalValue, even with InternalLinkage type, may have operands with // ExternalLinkage type. Do not ignore these operands. if (Constant* c = dyn_cast(value)) { - // Handle ConstantExpr, ConstantStruct, ConstantArry etc.. + // Handle ConstantExpr, ConstantStruct, ConstantArry etc. for (unsigned i = 0, e = c->getNumOperands(); i != e; ++i) findExternalRefs(c->getOperand(i), mangler); } @@ -454,7 +454,7 @@ void LTOModule::findExternalRefs(Value* value, Mangler &mangler) { void LTOModule::lazyParseSymbols() { - if ( !_symbolsParsed ) { + if (!_symbolsParsed) { _symbolsParsed = true; // Use mangler to add GlobalPrefix to names to match linker names. @@ -470,7 +470,7 @@ void LTOModule::lazyParseSymbols() // add functions for (Module::iterator f = _module->begin(); f != _module->end(); ++f) { - if ( f->isDeclaration() ) + if (f->isDeclaration()) addPotentialUndefinedSymbol(f, mangler); else addDefinedFunctionSymbol(f, mangler); @@ -479,7 +479,7 @@ void LTOModule::lazyParseSymbols() // add data for (Module::global_iterator v = _module->global_begin(), e = _module->global_end(); v != e; ++v) { - if ( v->isDeclaration() ) + if (v->isDeclaration()) addPotentialUndefinedSymbol(v, mangler); else addDefinedDataSymbol(v, mangler); @@ -516,7 +516,7 @@ void LTOModule::lazyParseSymbols() it != _undefines.end(); ++it) { // if this symbol also has a definition, then don't make an undefine // because it is a tentative definition - if ( _defines.count(it->getKey()) == 0 ) { + if (_defines.count(it->getKey()) == 0) { NameAndAttributes info = it->getValue(); _symbols.push_back(info); } @@ -535,7 +535,7 @@ uint32_t LTOModule::getSymbolCount() lto_symbol_attributes LTOModule::getSymbolAttributes(uint32_t index) { lazyParseSymbols(); - if ( index < _symbols.size() ) + if (index < _symbols.size()) return _symbols[index].attributes; else return lto_symbol_attributes(0); @@ -544,7 +544,7 @@ lto_symbol_attributes LTOModule::getSymbolAttributes(uint32_t index) const char* LTOModule::getSymbolName(uint32_t index) { lazyParseSymbols(); - if ( index < _symbols.size() ) + if (index < _symbols.size()) return _symbols[index].name; else return NULL;