diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-13 12:51:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
| commit | d441d6f39bb846989d95bcf5caf387b42414718d (patch) | |
| tree | e367e64a75991c554930278175d403c072de6bb8 /Source/JavaScriptCore/dfg/DFGCFAPhase.cpp | |
| parent | 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff) | |
| download | qtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz | |
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit.
Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/JavaScriptCore/dfg/DFGCFAPhase.cpp')
| -rw-r--r-- | Source/JavaScriptCore/dfg/DFGCFAPhase.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/Source/JavaScriptCore/dfg/DFGCFAPhase.cpp b/Source/JavaScriptCore/dfg/DFGCFAPhase.cpp index 1a88066d1..599a7918a 100644 --- a/Source/JavaScriptCore/dfg/DFGCFAPhase.cpp +++ b/Source/JavaScriptCore/dfg/DFGCFAPhase.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Apple Inc. All rights reserved. + * Copyright (C) 2011, 2013 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -31,6 +31,7 @@ #include "DFGAbstractState.h" #include "DFGGraph.h" #include "DFGPhase.h" +#include "Operations.h" namespace JSC { namespace DFG { @@ -44,6 +45,10 @@ public: bool run() { + ASSERT(m_graph.m_form == ThreadedCPS); + ASSERT(m_graph.m_unificationState == GloballyUnified); + ASSERT(m_graph.m_refCountState == EverythingIsLive); + #if DFG_ENABLE(DEBUG_PROPAGATION_VERBOSE) m_count = 0; #endif @@ -87,11 +92,9 @@ private: dataLogF("\n"); #endif for (unsigned i = 0; i < block->size(); ++i) { - NodeIndex nodeIndex = block->at(i); - if (!m_graph[nodeIndex].shouldGenerate()) - continue; #if DFG_ENABLE(DEBUG_PROPAGATION_VERBOSE) - dataLogF(" %s @%u: ", Graph::opName(m_graph[nodeIndex].op()), nodeIndex); + Node* node = block->at(i); + dataLogF(" %s @%u: ", Graph::opName(node->op()), node->index()); m_state.dump(WTF::dataFile()); dataLogF("\n"); #endif |