diff options
Diffstat (limited to 'llvm/tools')
| -rw-r--r-- | llvm/tools/llvm-mc/AsmLexer.cpp | 15 | ||||
| -rw-r--r-- | llvm/tools/lto/LTOModule.cpp | 5 |
2 files changed, 11 insertions, 9 deletions
diff --git a/llvm/tools/llvm-mc/AsmLexer.cpp b/llvm/tools/llvm-mc/AsmLexer.cpp index 6ee91455b71..e872090c685 100644 --- a/llvm/tools/llvm-mc/AsmLexer.cpp +++ b/llvm/tools/llvm-mc/AsmLexer.cpp @@ -107,8 +107,9 @@ asmtok::TokKind AsmLexer::LexIdentifier() { *CurPtr == '.' || *CurPtr == '@') ++CurPtr; // Unique string. - CurStrVal = - getSS(TheStringSet).GetOrCreateValue(TokStart, CurPtr, 0).getKeyData(); + CurStrVal = getSS(TheStringSet).GetOrCreateValue(StringRef(TokStart, + CurPtr - TokStart), + 0).getKeyData(); return asmtok::Identifier; } @@ -121,8 +122,9 @@ asmtok::TokKind AsmLexer::LexPercent() { ++CurPtr; // Unique string. - CurStrVal = - getSS(TheStringSet).GetOrCreateValue(TokStart, CurPtr, 0).getKeyData(); + CurStrVal = getSS(TheStringSet).GetOrCreateValue(StringRef(TokStart, + CurPtr - TokStart), + 0).getKeyData(); return asmtok::Register; } @@ -249,8 +251,9 @@ asmtok::TokKind AsmLexer::LexQuote() { } // Unique string, include quotes for now. - CurStrVal = - getSS(TheStringSet).GetOrCreateValue(TokStart, CurPtr, 0).getKeyData(); + CurStrVal = getSS(TheStringSet).GetOrCreateValue(StringRef(TokStart, + CurPtr - TokStart), + 0).getKeyData(); return asmtok::String; } diff --git a/llvm/tools/lto/LTOModule.cpp b/llvm/tools/lto/LTOModule.cpp index 3637b9d08ac..a72938a43b0 100644 --- a/llvm/tools/lto/LTOModule.cpp +++ b/llvm/tools/lto/LTOModule.cpp @@ -379,7 +379,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, &name[strlen(name)+1]) == 0 ) + if ( _defines.count(name) == 0 ) return; // string is owned by _defines @@ -507,8 +507,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->getKeyData(), it->getKeyData()+ - it->getKeyLength()) == 0 ) { + if ( _defines.count(it->getKey())) { NameAndAttributes info = it->getValue(); _symbols.push_back(info); } |
