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/DFGAbstractState.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/DFGAbstractState.cpp')
| -rw-r--r-- | Source/JavaScriptCore/dfg/DFGAbstractState.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/JavaScriptCore/dfg/DFGAbstractState.cpp b/Source/JavaScriptCore/dfg/DFGAbstractState.cpp index eff653636..594097d1b 100644 --- a/Source/JavaScriptCore/dfg/DFGAbstractState.cpp +++ b/Source/JavaScriptCore/dfg/DFGAbstractState.cpp @@ -1079,10 +1079,8 @@ bool AbstractState::executeEffects(unsigned indexInBlock, Node* node) clobberWorld(node->codeOrigin, indexInBlock); SpeculatedType type = source.m_type; - if (type & ~(SpecNumber | SpecString | SpecBoolean)) { - type &= (SpecNumber | SpecString | SpecBoolean); - type |= SpecString; - } + if (type & ~(SpecNumber | SpecString | SpecBoolean)) + type = (SpecTop & ~SpecCell) | SpecString; destination.set(type); break; } |