Changeset 142649 in webkit

Timestamp:

Feb 12, 2013 11:46:11 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

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

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• bytecode/UnlinkedCodeBlock.cpp (modified) (3 diffs)
• bytecode/UnlinkedCodeBlock.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp

@@ -161 +161 @@
     , m_numCalleeRegisters(0)
     , m_numParameters(0)
+    , m_globalData(globalData)
     , m_argumentsRegister(-1)
     , m_needsFullScopeChain(info.m_needsActivation)
@@ -168 +169 @@
     , 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)
@@ -179 +180 @@
     , m_valueProfileCount(0)
     , m_llintCallLinkInfoCount(0)
-    , m_globalData(globalData)
 #if ENABLE(BYTECODE_COMMENTS)
     , m_bytecodeCommentIterator(0)

trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h

@@ -487 +487 @@
 
     int m_numParameters;
+    JSGlobalData* m_globalData;
+
     int m_thisRegister;
     int m_argumentsRegister;
@@ -497 +499 @@
     bool m_isConstructor : 1;
     bool m_hasCapturedVariables : 1;
-    CodeType m_codeType : 2;
-    CodeFeatures m_features : 16;
-
     unsigned m_firstLine;
     unsigned m_lineCount;
+
+    CodeFeatures m_features;
+    CodeType m_codeType;
+
+    Vector<unsigned> m_jumpTargets;
+
+    // Constant Pools
+    Vector<Identifier> m_identifiers;
+    Vector<WriteBarrier<Unknown> > m_constantRegisters;
+    typedef Vector<WriteBarrier<UnlinkedFunctionExecutable> > FunctionExpressionVector;
+    FunctionExpressionVector m_functionDecls;
+    FunctionExpressionVector m_functionExprs;
+
+    WriteBarrier<SharedSymbolTable> m_symbolTable;
+
+    Vector<LineInfo> m_lineInfo;
+
+    Vector<unsigned> m_propertyAccessInstructions;
+
+#if ENABLE(BYTECODE_COMMENTS)
+    Vector<Comment>  m_bytecodeComments;
+    size_t m_bytecodeCommentIterator;
+#endif
 
     unsigned m_resolveOperationCount;
@@ -511 +533 @@
     unsigned m_llintCallLinkInfoCount;
 
-    JSGlobalData* m_globalData;
-
-    Vector<unsigned> m_jumpTargets;
-
-    // Constant Pools
-    Vector<Identifier> m_identifiers;
-    Vector<WriteBarrier<Unknown> > m_constantRegisters;
-    typedef Vector<WriteBarrier<UnlinkedFunctionExecutable> > FunctionExpressionVector;
-    FunctionExpressionVector m_functionDecls;
-    FunctionExpressionVector m_functionExprs;
-
-    WriteBarrier<SharedSymbolTable> m_symbolTable;
-
-    Vector<LineInfo> m_lineInfo;
-
-    Vector<unsigned> m_propertyAccessInstructions;
-
-#if ENABLE(BYTECODE_COMMENTS)
-    Vector<Comment>  m_bytecodeComments;
-    size_t m_bytecodeCommentIterator;
-#endif
-
 public:
     struct RareData {