diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 09:10:40 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 09:10:40 +0200 |
| commit | 0f68b45974d9da98af22a5d33269bd31c8726221 (patch) | |
| tree | c9504f653ede07db0be37dfb265ff550f36f8609 /Source/JavaScriptCore/dfg/DFGOSREntry.cpp | |
| parent | a49a02994a5a45cf9966a68621059b0ee9278e0f (diff) | |
| parent | 738ad7e37c66f2afdbc7a77aff3ab7fa510361a2 (diff) | |
| download | qtwebkit-0f68b45974d9da98af22a5d33269bd31c8726221.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.0-beta1
Change-Id: I0d9dd63455dc12402afd56cc1bd97d0cc97c24e8
Diffstat (limited to 'Source/JavaScriptCore/dfg/DFGOSREntry.cpp')
| -rw-r--r-- | Source/JavaScriptCore/dfg/DFGOSREntry.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/JavaScriptCore/dfg/DFGOSREntry.cpp b/Source/JavaScriptCore/dfg/DFGOSREntry.cpp index 5739593ee..9b75e70ab 100644 --- a/Source/JavaScriptCore/dfg/DFGOSREntry.cpp +++ b/Source/JavaScriptCore/dfg/DFGOSREntry.cpp @@ -118,7 +118,7 @@ void* prepareOSREntry(ExecState* exec, CodeBlock* codeBlock, unsigned bytecodeIn } continue; } - if (!entry->m_expectedValues.local(local).validate(exec->registers()[local].jsValue())) { + if (!entry->m_expectedValues.local(local).isTop() && !entry->m_expectedValues.local(local).validate(exec->registers()[local].jsValue())) { #if ENABLE(JIT_VERBOSE_OSR) dataLog(" OSR failed because variable ", local, " is ", exec->registers()[local].jsValue(), ", expected ", entry->m_expectedValues.local(local), ".\n"); #endif |