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).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2013-02-12

* bytecode/UnlinkedCodeBlock.cpp:
(JSC::UnlinkedCodeBlock::UnlinkedCodeBlock):
* bytecode/UnlinkedCodeBlock.h:
(UnlinkedCodeBlock):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@142649 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 6b05fc27d21d37affc7538aeffb7574b8e7af2b0..ec65994d3ded77bc3ced00ce5105afeca6796b9a 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,17 @@
+2013-02-12  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        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  <fpizlo@apple.com>
 
         DFG CompareEq optimization should be retuned

diff --git a/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp b/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp
index a3a4dd32e2d80583395fadc4f3c7845b68886bcb..8462b9a30da84ae40d609f6de68600bd9ec5fa43 100644 (file)
--- a/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp
+++ b/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp
@@ -160,6 +160,7 @@ UnlinkedCodeBlock::UnlinkedCodeBlock(JSGlobalData* globalData, Structure* struct
     , 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 @@ UnlinkedCodeBlock::UnlinkedCodeBlock(JSGlobalData* globalData, Structure* struct
     , 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 @@ UnlinkedCodeBlock::UnlinkedCodeBlock(JSGlobalData* globalData, Structure* struct
     , m_objectAllocationProfileCount(0)
     , m_valueProfileCount(0)
     , m_llintCallLinkInfoCount(0)
-    , m_globalData(globalData)
 #if ENABLE(BYTECODE_COMMENTS)
     , m_bytecodeCommentIterator(0)
 #endif

diff --git a/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h b/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h
index dad9fd5bd602b48bffffd5b886d28468d3ad9a75..3ca27ae9a700eb946002c9b0db496ec81770af3a 100644 (file)
--- a/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h
+++ b/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h
@@ -486,6 +486,8 @@ private:
     RefCountedArray<UnlinkedInstruction> m_unlinkedInstructions;
 
     int m_numParameters;
+    JSGlobalData* m_globalData;
+
     int m_thisRegister;
     int m_argumentsRegister;
     int m_activationRegister;
@@ -496,21 +498,11 @@ private:
     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;
-
-    JSGlobalData* m_globalData;
+    CodeFeatures m_features;
+    CodeType m_codeType;
 
     Vector<unsigned> m_jumpTargets;
 
@@ -532,6 +524,14 @@ private:
     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;