Changeset 95914 in webkit

Timestamp:

Sep 24, 2011 3:36:57 PM (13 years ago)

Author:

ggaren@apple.com

Message:

Some Windows build fixage.

• heap/MarkedBlock.cpp:

(JSC::MarkedBlock::sweep):

• heap/MarkedBlock.h:

(JSC::MarkedBlock::isLive): Show the compiler that all control paths
return a value. There, there, compiler. Everything's going to be OK.

• runtime/JSCell.h:

(JSC::JSCell::setVPtr): Oops! Unrename this function.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• heap/MarkedBlock.cpp (modified) (1 diff)
• heap/MarkedBlock.h (modified) (1 diff)
• runtime/JSCell.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-09-24  Geoffrey Garen  <ggaren@apple.com>
+
+        Some Windows build fixage.
+
+        * heap/MarkedBlock.cpp:
+        (JSC::MarkedBlock::sweep):
+        * heap/MarkedBlock.h:
+        (JSC::MarkedBlock::isLive): Show the compiler that all control paths
+        return a value. There, there, compiler. Everything's going to be OK.
+
+        * runtime/JSCell.h:
+        (JSC::JSCell::setVPtr): Oops! Unrename this function.
+
 2011-09-24  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/JavaScriptCore/heap/MarkedBlock.cpp

@@ -135 +135 @@
             : specializedSweep<Zapped, SweepOnly>();
     }
+
+    ASSERT_NOT_REACHED();
+    return 0;
 }
 

trunk/Source/JavaScriptCore/heap/MarkedBlock.h

@@ -272 +272 @@
             return false;
         }
+
+        ASSERT_NOT_REACHED();
+        return false;
     }
 

trunk/Source/JavaScriptCore/runtime/JSCell.h

@@ -99 +99 @@
 
         void* vptr() const { ASSERT(!isZapped()); return *reinterpret_cast<void* const*>(this); }
-        void setVptr(void* vptr) { *reinterpret_cast<void**>(this) = vptr; ASSERT(!isZapped()); }
+        void setVPtr(void* vptr) { *reinterpret_cast<void**>(this) = vptr; ASSERT(!isZapped()); }
         void zap() { *reinterpret_cast<uintptr_t**>(this) = 0; }
         bool isZapped() const { return !*reinterpret_cast<uintptr_t* const*>(this); }