summaryrefslogtreecommitdiff
path: root/tools/llvm-mc
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2009-07-28 00:58:50 +0000
committerDaniel Dunbar <daniel@zuster.org>2009-07-28 00:58:50 +0000
commit825e385ffe767561a62966df76af0b19e71002aa (patch)
tree1de8a831e8168dea43b0aa5892fe157efe9c67dd /tools/llvm-mc
parent04d5544034686b86752b12a4910753df675ab62b (diff)
downloadllvm-825e385ffe767561a62966df76af0b19e71002aa.tar.gz
llvm-825e385ffe767561a62966df76af0b19e71002aa.tar.bz2
llvm-825e385ffe767561a62966df76af0b19e71002aa.tar.xz
llvm-mc: Stop uniqueing string tokens, nothing actually uses this.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@77287 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/llvm-mc')
-rw-r--r--tools/llvm-mc/AsmLexer.cpp20
-rw-r--r--tools/llvm-mc/AsmLexer.h4
2 files changed, 4 insertions, 20 deletions
diff --git a/tools/llvm-mc/AsmLexer.cpp b/tools/llvm-mc/AsmLexer.cpp
index e872090c68..0550bb1883 100644
--- a/tools/llvm-mc/AsmLexer.cpp
+++ b/tools/llvm-mc/AsmLexer.cpp
@@ -12,7 +12,6 @@
//===----------------------------------------------------------------------===//
#include "AsmLexer.h"
-#include "llvm/ADT/StringSet.h"
#include "llvm/Support/SourceMgr.h"
#include "llvm/Support/MemoryBuffer.h"
#include "llvm/Config/config.h" // for strtoull.
@@ -21,21 +20,14 @@
#include <cstdlib>
using namespace llvm;
-static StringSet<> &getSS(void *TheSS) {
- return *(StringSet<>*)TheSS;
-}
-
AsmLexer::AsmLexer(SourceMgr &SM) : SrcMgr(SM) {
CurBuffer = 0;
CurBuf = SrcMgr.getMemoryBuffer(CurBuffer);
CurPtr = CurBuf->getBufferStart();
TokStart = 0;
-
- TheStringSet = new StringSet<>();
}
AsmLexer::~AsmLexer() {
- delete &getSS(TheStringSet);
}
SMLoc AsmLexer::getLoc() const {
@@ -107,9 +99,7 @@ asmtok::TokKind AsmLexer::LexIdentifier() {
*CurPtr == '.' || *CurPtr == '@')
++CurPtr;
// Unique string.
- CurStrVal = getSS(TheStringSet).GetOrCreateValue(StringRef(TokStart,
- CurPtr - TokStart),
- 0).getKeyData();
+ CurStrVal = StringRef(TokStart, CurPtr - TokStart);
return asmtok::Identifier;
}
@@ -122,9 +112,7 @@ asmtok::TokKind AsmLexer::LexPercent() {
++CurPtr;
// Unique string.
- CurStrVal = getSS(TheStringSet).GetOrCreateValue(StringRef(TokStart,
- CurPtr - TokStart),
- 0).getKeyData();
+ CurStrVal = StringRef(TokStart, CurPtr - TokStart);
return asmtok::Register;
}
@@ -251,9 +239,7 @@ asmtok::TokKind AsmLexer::LexQuote() {
}
// Unique string, include quotes for now.
- CurStrVal = getSS(TheStringSet).GetOrCreateValue(StringRef(TokStart,
- CurPtr - TokStart),
- 0).getKeyData();
+ CurStrVal = StringRef(TokStart, CurPtr - TokStart);
return asmtok::String;
}
diff --git a/tools/llvm-mc/AsmLexer.h b/tools/llvm-mc/AsmLexer.h
index c862a05840..25311c8f9f 100644
--- a/tools/llvm-mc/AsmLexer.h
+++ b/tools/llvm-mc/AsmLexer.h
@@ -59,13 +59,11 @@ class AsmLexer : public MCAsmLexer {
const char *CurPtr;
const MemoryBuffer *CurBuf;
- // A llvm::StringSet<>, which provides uniqued and null-terminated strings.
- void *TheStringSet;
// Information about the current token.
const char *TokStart;
asmtok::TokKind CurKind;
- const char *CurStrVal; // This is valid for Identifier.
+ StringRef CurStrVal; // This is valid for Identifier.
int64_t CurIntVal;
/// CurBuffer - This is the current buffer index we're lexing from as managed