summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2014-10-31 15:13:53 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-10-31 16:05:49 +0100
commit94711f7406fa8bd71728a1cc912870489f8c5447 (patch)
tree27962bb8a62a572b015334eb6d97e0a4db1e736e
parent433c3d876d2f7266efa963def47fa9ef1a483cbc (diff)
parent14c77ecb6e56b3c3979ab612305fece60eb2be9b (diff)
Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4
-rw-r--r--Source/JavaScriptCore/dfg/DFGAbstractState.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/JavaScriptCore/dfg/DFGAbstractState.cpp b/Source/JavaScriptCore/dfg/DFGAbstractState.cpp
index 19bad5c09..eff653636 100644
--- a/Source/JavaScriptCore/dfg/DFGAbstractState.cpp
+++ b/Source/JavaScriptCore/dfg/DFGAbstractState.cpp
@@ -476,6 +476,7 @@ bool AbstractState::executeEffects(unsigned indexInBlock, Node* node)
}
case MakeRope: {
+ node->setCanExit(true);
forNode(node).set(m_graph.m_vm.stringStructure.get());
break;
}