diff options
| author | Jeffrey Yasskin <jyasskin@google.com> | 2011-08-30 20:53:29 +0000 |
|---|---|---|
| committer | Jeffrey Yasskin <jyasskin@google.com> | 2011-08-30 20:53:29 +0000 |
| commit | cda2a146d1fcf3f499a1aa535377fb332e918bd5 (patch) | |
| tree | 79d15bba2b8ecd0b796950556b61b94f6b4b23f5 /lib/MC | |
| parent | 2ac6b0185466024e306de142623b803565a1c526 (diff) | |
| download | llvm-cda2a146d1fcf3f499a1aa535377fb332e918bd5.tar.gz llvm-cda2a146d1fcf3f499a1aa535377fb332e918bd5.tar.bz2 llvm-cda2a146d1fcf3f499a1aa535377fb332e918bd5.tar.xz | |
Fix C++0x narrowing errors when char is unsigned.
In the case of EDInstInfo, this would actually cause a bug when -1 became 255
and was then compared >=0 in llvm-mc/Disassembler.cpp.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@138825 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/MC')
| -rw-r--r-- | lib/MC/MCDisassembler/EDInst.h | 2 | ||||
| -rw-r--r-- | lib/MC/MCDisassembler/EDToken.cpp | 2 | ||||
| -rw-r--r-- | lib/MC/MCDisassembler/EDToken.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/MC/MCDisassembler/EDInst.h b/lib/MC/MCDisassembler/EDInst.h index ceb9505028..6b78dc826c 100644 --- a/lib/MC/MCDisassembler/EDInst.h +++ b/lib/MC/MCDisassembler/EDInst.h @@ -73,7 +73,7 @@ struct EDInst { std::string String; /// The order in which operands from the InstInfo's operand information appear /// in String - const char* OperandOrder; + const signed char* OperandOrder; /// The result of the parseOperands() function CachedResult ParseResult; diff --git a/lib/MC/MCDisassembler/EDToken.cpp b/lib/MC/MCDisassembler/EDToken.cpp index edbe0e0082..5f6c9df481 100644 --- a/lib/MC/MCDisassembler/EDToken.cpp +++ b/lib/MC/MCDisassembler/EDToken.cpp @@ -87,7 +87,7 @@ int EDToken::registerID(unsigned ®isterID) const { int EDToken::tokenize(std::vector<EDToken*> &tokens, std::string &str, - const char *operandOrder, + const signed char *operandOrder, EDDisassembler &disassembler) { SmallVector<MCParsedAsmOperand*, 5> parsedOperands; SmallVector<AsmToken, 10> asmTokens; diff --git a/lib/MC/MCDisassembler/EDToken.h b/lib/MC/MCDisassembler/EDToken.h index ba46707868..384079b72e 100644 --- a/lib/MC/MCDisassembler/EDToken.h +++ b/lib/MC/MCDisassembler/EDToken.h @@ -125,7 +125,7 @@ struct EDToken { // assembly syntax static int tokenize(std::vector<EDToken*> &tokens, std::string &str, - const char *operandOrder, + const signed char *operandOrder, EDDisassembler &disassembler); /// getString - Directs a character pointer to the string, returning 0 on |