[webkit-changes] [126476] trunk/Source/JavaScriptCore

Thu, 23 Aug 2012 13:49:44 -0700

Title: [126476] trunk/Source/_javascript_Core
Revision
126476
Author
[email protected]
Date
2012-08-23 13:50:18 -0700 (Thu, 23 Aug 2012)

Log Message

Make _javascript_Core build with the latest version of clang.

Reviewed by Dan Bernstein.

* heap/MachineStackMarker.cpp:
(JSC::MachineThreads::MachineThreads): The m_heap member is only used within
assertions, so guard its initialization with !ASSERT_DISABLED.
* heap/MachineStackMarker.h:
(MachineThreads): Ditto for its declaration.
* jit/JITStubCall.h:
(JSC::JITStubCall::JITStubCall): The m_returnType member is only used within
assertions or if we're using JSVALUE32_64, so guard its uses with the appropriate
(JITStubCall): Ditto.

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (126475 => 126476)


--- trunk/Source/_javascript_Core/ChangeLog	2012-08-23 20:50:13 UTC (rev 126475)
+++ trunk/Source/_javascript_Core/ChangeLog	2012-08-23 20:50:18 UTC (rev 126476)
@@ -1,3 +1,20 @@
+2012-08-23  Mark Rowe  <[email protected]>
+
+        Make _javascript_Core build with the latest version of clang.
+
+        Reviewed by Dan Bernstein.
+
+        * heap/MachineStackMarker.cpp:
+        (JSC::MachineThreads::MachineThreads): The m_heap member is only used within
+        assertions, so guard its initialization with !ASSERT_DISABLED.
+        * heap/MachineStackMarker.h:
+        (MachineThreads): Ditto for its declaration.
+        * jit/JITStubCall.h:
+        (JSC::JITStubCall::JITStubCall): The m_returnType member is only used within
+        assertions or if we're using JSVALUE32_64, so guard its uses with the appropriate
+        #if.
+        (JITStubCall): Ditto.
+
 2012-08-23  Christophe Dumez  <[email protected]>
 
         Serialization of _javascript_ values does not appear to respect new HTML5 Structured Clone semantics

Modified: trunk/Source/_javascript_Core/heap/MachineStackMarker.cpp (126475 => 126476)


--- trunk/Source/_javascript_Core/heap/MachineStackMarker.cpp	2012-08-23 20:50:13 UTC (rev 126475)
+++ trunk/Source/_javascript_Core/heap/MachineStackMarker.cpp	2012-08-23 20:50:18 UTC (rev 126476)
@@ -133,10 +133,13 @@
 };
 
 MachineThreads::MachineThreads(Heap* heap)
-    : m_heap(heap)
-    , m_registeredThreads(0)
+    : m_registeredThreads(0)
     , m_threadSpecific(0)
+#if !ASSERT_DISABLED
+    , m_heap(heap)
+#endif
 {
+    UNUSED_PARAM(heap);
 }
 
 MachineThreads::~MachineThreads()

Modified: trunk/Source/_javascript_Core/heap/MachineStackMarker.h (126475 => 126476)


--- trunk/Source/_javascript_Core/heap/MachineStackMarker.h	2012-08-23 20:50:13 UTC (rev 126475)
+++ trunk/Source/_javascript_Core/heap/MachineStackMarker.h	2012-08-23 20:50:18 UTC (rev 126476)
@@ -52,10 +52,12 @@
 
         void gatherFromOtherThread(ConservativeRoots&, Thread*);
 
-        Heap* m_heap;
         Mutex m_registeredThreadsMutex;
         Thread* m_registeredThreads;
         WTF::ThreadSpecificKey m_threadSpecific;
+#if !ASSERT_DISABLED
+        Heap* m_heap;
+#endif
     };
 
 } // namespace JSC

Modified: trunk/Source/_javascript_Core/jit/JITStubCall.h (126475 => 126476)


--- trunk/Source/_javascript_Core/jit/JITStubCall.h	2012-08-23 20:50:13 UTC (rev 126475)
+++ trunk/Source/_javascript_Core/jit/JITStubCall.h	2012-08-23 20:50:18 UTC (rev 126476)
@@ -37,7 +37,9 @@
         JITStubCall(JIT* jit, JSObject* (JIT_STUB *stub)(STUB_ARGS_DECLARATION))
             : m_jit(jit)
             , m_stub(stub)
+#if USE(JSVALUE32_64) || !ASSERT_DISABLED
             , m_returnType(Cell)
+#endif
             , m_stackIndex(JITSTACKFRAME_ARGS_INDEX)
         {
         }
@@ -45,7 +47,9 @@
         JITStubCall(JIT* jit, JSPropertyNameIterator* (JIT_STUB *stub)(STUB_ARGS_DECLARATION))
             : m_jit(jit)
             , m_stub(stub)
+#if USE(JSVALUE32_64) || !ASSERT_DISABLED
             , m_returnType(Cell)
+#endif
             , m_stackIndex(JITSTACKFRAME_ARGS_INDEX)
         {
         }
@@ -53,7 +57,9 @@
         JITStubCall(JIT* jit, void* (JIT_STUB *stub)(STUB_ARGS_DECLARATION))
             : m_jit(jit)
             , m_stub(stub)
+#if USE(JSVALUE32_64) || !ASSERT_DISABLED      
             , m_returnType(VoidPtr)
+#endif
             , m_stackIndex(JITSTACKFRAME_ARGS_INDEX)
         {
         }
@@ -61,7 +67,9 @@
         JITStubCall(JIT* jit, int (JIT_STUB *stub)(STUB_ARGS_DECLARATION))
             : m_jit(jit)
             , m_stub(stub)
+#if USE(JSVALUE32_64) || !ASSERT_DISABLED
             , m_returnType(Int)
+#endif
             , m_stackIndex(JITSTACKFRAME_ARGS_INDEX)
         {
         }
@@ -69,7 +77,9 @@
         JITStubCall(JIT* jit, bool (JIT_STUB *stub)(STUB_ARGS_DECLARATION))
             : m_jit(jit)
             , m_stub(stub)
+#if USE(JSVALUE32_64) || !ASSERT_DISABLED
             , m_returnType(Int)
+#endif
             , m_stackIndex(JITSTACKFRAME_ARGS_INDEX)
         {
         }
@@ -77,7 +87,9 @@
         JITStubCall(JIT* jit, void (JIT_STUB *stub)(STUB_ARGS_DECLARATION))
             : m_jit(jit)
             , m_stub(stub)
+#if USE(JSVALUE32_64) || !ASSERT_DISABLED
             , m_returnType(Void)
+#endif
             , m_stackIndex(JITSTACKFRAME_ARGS_INDEX)
         {
         }
@@ -265,7 +277,9 @@
 
         JIT* m_jit;
         FunctionPtr m_stub;
+#if USE(JSVALUE32_64) || !ASSERT_DISABLED
         enum { Void, VoidPtr, Int, Value, Cell } m_returnType;
+#endif
         size_t m_stackIndex;
     };
 }

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to