diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-05 07:28:05 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-06-05 07:28:05 +0000 |
| commit | 6aa5a2787dbdeb275beab75e2de660c422ad51fb (patch) | |
| tree | 42032ecb3d01e8eefcae98b28179834dc153d817 /Source/JavaScriptCore/dfg/DFGOSREntry.cpp | |
| parent | b4414ec72ef60ce90551de23990bad4be349acbc (diff) | |
| parent | 8eba6d043d51b2f1dbabc042bb207e8677ef11f3 (diff) | |
| download | qtwebkit-6aa5a2787dbdeb275beab75e2de660c422ad51fb.tar.gz | |
Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev
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 |