diff options
Diffstat (limited to 'Source/JavaScriptCore/dfg/DFGUnificationPhase.cpp')
| -rw-r--r-- | Source/JavaScriptCore/dfg/DFGUnificationPhase.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Source/JavaScriptCore/dfg/DFGUnificationPhase.cpp b/Source/JavaScriptCore/dfg/DFGUnificationPhase.cpp index 30003f315..8f2929d5c 100644 --- a/Source/JavaScriptCore/dfg/DFGUnificationPhase.cpp +++ b/Source/JavaScriptCore/dfg/DFGUnificationPhase.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013, 2015 Apple Inc. All rights reserved. + * Copyright (C) 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,7 +31,7 @@ #include "DFGBasicBlockInlines.h" #include "DFGGraph.h" #include "DFGPhase.h" -#include "JSCInlines.h" +#include "Operations.h" namespace JSC { namespace DFG { @@ -59,10 +59,9 @@ public: for (unsigned childIdx = 0; childIdx < AdjacencyList::Size; ++childIdx) { if (!phi->children.child(childIdx)) break; - - // FIXME: Consider reversing the order of this unification, since the other - // order will reveal more bugs. https://bugs.webkit.org/show_bug.cgi?id=154368 - phi->variableAccessData()->unify(phi->children.child(childIdx)->variableAccessData()); + + phi->variableAccessData()->unify( + phi->children.child(childIdx)->variableAccessData()); } } } @@ -71,11 +70,11 @@ public: for (unsigned i = 0; i < m_graph.m_variableAccessData.size(); ++i) { VariableAccessData* data = &m_graph.m_variableAccessData[i]; data->find()->predict(data->nonUnifiedPrediction()); + data->find()->mergeIsCaptured(data->isCaptured()); data->find()->mergeStructureCheckHoistingFailed(data->structureCheckHoistingFailed()); data->find()->mergeCheckArrayHoistingFailed(data->checkArrayHoistingFailed()); data->find()->mergeShouldNeverUnbox(data->shouldNeverUnbox()); data->find()->mergeIsLoadedFrom(data->isLoadedFrom()); - data->find()->mergeIsProfitableToUnbox(data->isProfitableToUnbox()); } m_graph.m_unificationState = GloballyUnified; |