aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/Target/X86/AsmParser/X86AsmParser.cpp2
-rw-r--r--utils/TableGen/AsmMatcherEmitter.cpp16
2 files changed, 3 insertions, 15 deletions
diff --git a/lib/Target/X86/AsmParser/X86AsmParser.cpp b/lib/Target/X86/AsmParser/X86AsmParser.cpp
index c8d5ddabae..62cce47072 100644
--- a/lib/Target/X86/AsmParser/X86AsmParser.cpp
+++ b/lib/Target/X86/AsmParser/X86AsmParser.cpp
@@ -379,7 +379,7 @@ bool X86ATTAsmParser::ParseMemOperand(X86Operand &Op) {
}
bool X86ATTAsmParser::ParseInstruction(const StringRef &Name, MCInst &Inst) {
- SmallVector<X86Operand, 4> Operands;
+ SmallVector<X86Operand, 8> Operands;
Operands.push_back(X86Operand::CreateToken(Name));
diff --git a/utils/TableGen/AsmMatcherEmitter.cpp b/utils/TableGen/AsmMatcherEmitter.cpp
index f2adc00c07..f98ee3a083 100644
--- a/utils/TableGen/AsmMatcherEmitter.cpp
+++ b/utils/TableGen/AsmMatcherEmitter.cpp
@@ -86,8 +86,8 @@
using namespace llvm;
namespace {
- cl::opt<std::string>
- MatchOneInstr("match-one-instr", cl::desc("Match only the named instruction"),
+static cl::opt<std::string>
+MatchOneInstr("match-one-instr", cl::desc("Match only the named instruction"),
cl::init(""));
}
@@ -272,18 +272,6 @@ static bool IsAssemblerInstruction(const StringRef &Name,
namespace {
-struct OperandListLess {
- bool operator()(const
- std::pair<const CodeGenInstruction::OperandInfo*, unsigned> &
- A,
- const
- std::pair<const CodeGenInstruction::OperandInfo*, unsigned> &
- B) {
- return A.first->MIOperandNo < B.first->MIOperandNo;
- }
-
-};
-
struct InstructionInfo {
struct Operand {
enum {