summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2014-10-31 15:06:52 +0100
committerOswald Buddenhagen <oswald.buddenhagen@digia.com>2014-10-31 15:06:58 +0100
commit14c77ecb6e56b3c3979ab612305fece60eb2be9b (patch)
tree6f6e43756df0044164ab985e4f4c0cceaed87b10
parentb119b41b4b11a3555e45b7a52f4872cdb30507a7 (diff)
parent0930236a6e8bef5c2b90f1522a06acf9dee9c15d (diff)
downloadqtwebkit-14c77ecb6e56b3c3979ab612305fece60eb2be9b.tar.gz
Merge remote-tracking branch 'origin/5.3' into 5.4
Change-Id: I11f35f205d2ded597d54650a948bec3e1e52b419
-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;
}