Title: [153410] trunk/Source/_javascript_Core
- Revision
- 153410
- Author
- [email protected]
- Date
- 2013-07-28 11:04:18 -0700 (Sun, 28 Jul 2013)
Log Message
REGRESSION: Crash when opening Facebook.com
https://bugs.webkit.org/show_bug.cgi?id=119155
Reviewed by Andreas Kling.
Scope nodes are always objects, so we should be using SpecObjectOther
rather than SpecCellOther. Marking Scopes as CellOther leads to a
contradiction in the CFA, resulting in bogus codegen.
* dfg/DFGAbstractInterpreterInlines.h:
(JSC::DFG::::executeEffects):
* dfg/DFGPredictionPropagationPhase.cpp:
(JSC::DFG::PredictionPropagationPhase::propagate):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (153409 => 153410)
--- trunk/Source/_javascript_Core/ChangeLog 2013-07-28 06:48:35 UTC (rev 153409)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-07-28 18:04:18 UTC (rev 153410)
@@ -1,3 +1,19 @@
+2013-07-28 Oliver Hunt <[email protected]>
+
+ REGRESSION: Crash when opening Facebook.com
+ https://bugs.webkit.org/show_bug.cgi?id=119155
+
+ Reviewed by Andreas Kling.
+
+ Scope nodes are always objects, so we should be using SpecObjectOther
+ rather than SpecCellOther. Marking Scopes as CellOther leads to a
+ contradiction in the CFA, resulting in bogus codegen.
+
+ * dfg/DFGAbstractInterpreterInlines.h:
+ (JSC::DFG::::executeEffects):
+ * dfg/DFGPredictionPropagationPhase.cpp:
+ (JSC::DFG::PredictionPropagationPhase::propagate):
+
2013-07-26 Oliver Hunt <[email protected]>
REGRESSION(FTL?): Crashes in plugin tests
Modified: trunk/Source/_javascript_Core/dfg/DFGAbstractInterpreterInlines.h (153409 => 153410)
--- trunk/Source/_javascript_Core/dfg/DFGAbstractInterpreterInlines.h 2013-07-28 06:48:35 UTC (rev 153409)
+++ trunk/Source/_javascript_Core/dfg/DFGAbstractInterpreterInlines.h 2013-07-28 18:04:18 UTC (rev 153410)
@@ -1171,7 +1171,7 @@
case GetScope: // FIXME: We could get rid of these if we know that the JSFunction is a constant. https://bugs.webkit.org/show_bug.cgi?id=106202
case GetMyScope:
case SkipTopScope:
- forNode(node).setType(SpecCellOther);
+ forNode(node).setType(SpecObjectOther);
break;
case SkipScope: {
@@ -1180,7 +1180,7 @@
m_state.setFoundConstants(true);
break;
}
- forNode(node).setType(SpecCellOther);
+ forNode(node).setType(SpecObjectOther);
break;
}
Modified: trunk/Source/_javascript_Core/dfg/DFGPredictionPropagationPhase.cpp (153409 => 153410)
--- trunk/Source/_javascript_Core/dfg/DFGPredictionPropagationPhase.cpp 2013-07-28 06:48:35 UTC (rev 153409)
+++ trunk/Source/_javascript_Core/dfg/DFGPredictionPropagationPhase.cpp 2013-07-28 18:04:18 UTC (rev 153410)
@@ -392,7 +392,7 @@
case GetMyScope:
case SkipTopScope:
case SkipScope: {
- changed |= setPrediction(SpecCellOther);
+ changed |= setPrediction(SpecObjectOther);
break;
}
@@ -498,7 +498,7 @@
break;
case GetScope:
- changed |= setPrediction(SpecCellOther);
+ changed |= setPrediction(SpecObjectOther);
break;
case In:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes