diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-03-17 09:49:07 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-03-17 09:49:07 +0100 |
| commit | a49a02994a5a45cf9966a68621059b0ee9278e0f (patch) | |
| tree | b09f58d260ff40c28c225cc812a78d51cce7780e /Source/JavaScriptCore | |
| parent | 1ee472207c63905ab4455e676ee3ffd3263ab2cb (diff) | |
| parent | a7f2e6bf8c1bc569c56d713894f442c7fed63264 (diff) | |
| download | qtwebkit-a49a02994a5a45cf9966a68621059b0ee9278e0f.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Change-Id: I5add7bbeab559b3f14207c37c6e010f953f6a286
Diffstat (limited to 'Source/JavaScriptCore')
| -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; } |