Commit feddf01d authored by ggaren@apple.com's avatar 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.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@95914 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent bf1ededb
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> 2011-09-24 Geoffrey Garen <ggaren@apple.com>
Allocate new objects unmarked Allocate new objects unmarked
...@@ -134,6 +134,9 @@ MarkedBlock::FreeCell* MarkedBlock::sweep(SweepMode sweepMode) ...@@ -134,6 +134,9 @@ MarkedBlock::FreeCell* MarkedBlock::sweep(SweepMode sweepMode)
? specializedSweep<Zapped, SweepToFreeList>() ? specializedSweep<Zapped, SweepToFreeList>()
: specializedSweep<Zapped, SweepOnly>(); : specializedSweep<Zapped, SweepOnly>();
} }
ASSERT_NOT_REACHED();
return 0;
} }
void MarkedBlock::zapFreeList(FreeCell* firstFreeCell) void MarkedBlock::zapFreeList(FreeCell* firstFreeCell)
......
...@@ -271,6 +271,9 @@ namespace JSC { ...@@ -271,6 +271,9 @@ namespace JSC {
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
return false; return false;
} }
ASSERT_NOT_REACHED();
return false;
} }
inline bool MarkedBlock::isLiveCell(const void* p) inline bool MarkedBlock::isLiveCell(const void* p)
......
...@@ -98,7 +98,7 @@ namespace JSC { ...@@ -98,7 +98,7 @@ namespace JSC {
JSValue getJSNumber() const; JSValue getJSNumber() const;
void* vptr() const { ASSERT(!isZapped()); return *reinterpret_cast<void* const*>(this); } 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; } void zap() { *reinterpret_cast<uintptr_t**>(this) = 0; }
bool isZapped() const { return !*reinterpret_cast<uintptr_t* const*>(this); } bool isZapped() const { return !*reinterpret_cast<uintptr_t* const*>(this); }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment