diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-06-02 12:07:06 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-06-02 12:07:20 +0200 |
| commit | 8eba6d043d51b2f1dbabc042bb207e8677ef11f3 (patch) | |
| tree | 7fb24a5d406ccd5469bc59c34732b600c3fd2b1d /Source/JavaScriptCore/dfg/DFGOSREntry.cpp | |
| parent | 8b00fdada15a53c7764472435cffe04f22c3522f (diff) | |
| parent | dbbef9bee537a88a9d3e1656f4b7935023aacacf (diff) | |
| download | qtwebkit-8eba6d043d51b2f1dbabc042bb207e8677ef11f3.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I2e9acbd80e4a654a1fb4a5a9d79bb6bbaf5b1be8
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 |