diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
| commit | cfd86b747d32ac22246a1aa908eaa720c63a88c1 (patch) | |
| tree | 24d68c6f61c464ecba1e05670b80390ea3b0e50c /Source/JavaScriptCore/dfg/DFGGPRInfo.h | |
| parent | 69d7c744c9de19d152dbe2d8e46eb7dfd4511d1a (diff) | |
| download | qtwebkit-cfd86b747d32ac22246a1aa908eaa720c63a88c1.tar.gz | |
Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 (http://svn.webkit.org/repository/webkit/trunk@133733)
New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes.
Diffstat (limited to 'Source/JavaScriptCore/dfg/DFGGPRInfo.h')
| -rw-r--r-- | Source/JavaScriptCore/dfg/DFGGPRInfo.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/JavaScriptCore/dfg/DFGGPRInfo.h b/Source/JavaScriptCore/dfg/DFGGPRInfo.h index 498b116ec..3d07556cc 100644 --- a/Source/JavaScriptCore/dfg/DFGGPRInfo.h +++ b/Source/JavaScriptCore/dfg/DFGGPRInfo.h @@ -218,7 +218,7 @@ public: GPRReg tagGPR() const { - ASSERT(!isAddress() && m_baseOrTag != InvalidGPRReg); + ASSERT(!isAddress() && static_cast<GPRReg>(m_baseOrTag) != InvalidGPRReg); return static_cast<GPRReg>(m_baseOrTag); } @@ -290,7 +290,7 @@ public: static unsigned toIndex(GPRReg reg) { ASSERT(reg != InvalidGPRReg); - ASSERT(reg < 8); + ASSERT(static_cast<int>(reg) < 8); static const unsigned indexForRegister[8] = { 0, 2, 1, 3, InvalidIndex, InvalidIndex, 4, InvalidIndex }; unsigned result = indexForRegister[reg]; ASSERT(result != InvalidIndex); @@ -300,7 +300,7 @@ public: static const char* debugName(GPRReg reg) { ASSERT(reg != InvalidGPRReg); - ASSERT(reg < 8); + ASSERT(static_cast<int>(reg) < 8); static const char* nameForRegister[8] = { "eax", "ecx", "edx", "ebx", "esp", "ebp", "esi", "edi", @@ -362,7 +362,7 @@ public: static unsigned toIndex(GPRReg reg) { ASSERT(reg != InvalidGPRReg); - ASSERT(reg < 16); + ASSERT(static_cast<int>(reg) < 16); static const unsigned indexForRegister[16] = { 0, 2, 1, 3, InvalidIndex, InvalidIndex, 5, 4, 6, 7, 8, InvalidIndex, InvalidIndex, InvalidIndex, InvalidIndex, InvalidIndex }; unsigned result = indexForRegister[reg]; ASSERT(result != InvalidIndex); @@ -372,7 +372,7 @@ public: static const char* debugName(GPRReg reg) { ASSERT(reg != InvalidGPRReg); - ASSERT(reg < 16); + ASSERT(static_cast<int>(reg) < 16); static const char* nameForRegister[16] = { "rax", "rcx", "rdx", "rbx", "rsp", "rbp", "rsi", "rdi", |