Modified: trunk/Source/_javascript_Core/ChangeLog (142648 => 142649)
--- trunk/Source/_javascript_Core/ChangeLog 2013-02-12 19:39:38 UTC (rev 142648)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-02-12 19:46:11 UTC (rev 142649)
@@ -1,3 +1,17 @@
+2013-02-12 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r142387.
+ http://trac.webkit.org/changeset/142387
+ https://bugs.webkit.org/show_bug.cgi?id=109601
+
+ caused all layout and jscore tests on windows to fail
+ (Requested by kling on #webkit).
+
+ * bytecode/UnlinkedCodeBlock.cpp:
+ (JSC::UnlinkedCodeBlock::UnlinkedCodeBlock):
+ * bytecode/UnlinkedCodeBlock.h:
+ (UnlinkedCodeBlock):
+
2013-02-11 Filip Pizlo <[email protected]>
DFG CompareEq optimization should be retuned
Modified: trunk/Source/_javascript_Core/bytecode/UnlinkedCodeBlock.cpp (142648 => 142649)
--- trunk/Source/_javascript_Core/bytecode/UnlinkedCodeBlock.cpp 2013-02-12 19:39:38 UTC (rev 142648)
+++ trunk/Source/_javascript_Core/bytecode/UnlinkedCodeBlock.cpp 2013-02-12 19:46:11 UTC (rev 142649)
@@ -160,6 +160,7 @@
, m_numVars(0)
, m_numCalleeRegisters(0)
, m_numParameters(0)
+ , m_globalData(globalData)
, m_argumentsRegister(-1)
, m_needsFullScopeChain(info.m_needsActivation)
, m_usesEval(info.m_usesEval)
@@ -167,10 +168,10 @@
, m_isStrictMode(info.m_isStrictMode)
, m_isConstructor(info.m_isConstructor)
, m_hasCapturedVariables(false)
- , m_codeType(codeType)
- , m_features(0)
, m_firstLine(0)
, m_lineCount(0)
+ , m_features(0)
+ , m_codeType(codeType)
, m_resolveOperationCount(0)
, m_putToBaseOperationCount(1)
, m_arrayProfileCount(0)
@@ -178,7 +179,6 @@
, m_objectAllocationProfileCount(0)
, m_valueProfileCount(0)
, m_llintCallLinkInfoCount(0)
- , m_globalData(globalData)
#if ENABLE(BYTECODE_COMMENTS)
, m_bytecodeCommentIterator(0)
#endif
Modified: trunk/Source/_javascript_Core/bytecode/UnlinkedCodeBlock.h (142648 => 142649)
--- trunk/Source/_javascript_Core/bytecode/UnlinkedCodeBlock.h 2013-02-12 19:39:38 UTC (rev 142648)
+++ trunk/Source/_javascript_Core/bytecode/UnlinkedCodeBlock.h 2013-02-12 19:46:11 UTC (rev 142649)
@@ -486,6 +486,8 @@
RefCountedArray<UnlinkedInstruction> m_unlinkedInstructions;
int m_numParameters;
+ JSGlobalData* m_globalData;
+
int m_thisRegister;
int m_argumentsRegister;
int m_activationRegister;
@@ -496,22 +498,12 @@
bool m_isStrictMode : 1;
bool m_isConstructor : 1;
bool m_hasCapturedVariables : 1;
- CodeType m_codeType : 2;
- CodeFeatures m_features : 16;
-
unsigned m_firstLine;
unsigned m_lineCount;
- unsigned m_resolveOperationCount;
- unsigned m_putToBaseOperationCount;
- unsigned m_arrayProfileCount;
- unsigned m_arrayAllocationProfileCount;
- unsigned m_objectAllocationProfileCount;
- unsigned m_valueProfileCount;
- unsigned m_llintCallLinkInfoCount;
+ CodeFeatures m_features;
+ CodeType m_codeType;
- JSGlobalData* m_globalData;
-
Vector<unsigned> m_jumpTargets;
// Constant Pools
@@ -532,6 +524,14 @@
size_t m_bytecodeCommentIterator;
#endif
+ unsigned m_resolveOperationCount;
+ unsigned m_putToBaseOperationCount;
+ unsigned m_arrayProfileCount;
+ unsigned m_arrayAllocationProfileCount;
+ unsigned m_objectAllocationProfileCount;
+ unsigned m_valueProfileCount;
+ unsigned m_llintCallLinkInfoCount;
+
public:
struct RareData {
WTF_MAKE_FAST_ALLOCATED;
