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/DFGAbstractState.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/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; } |