diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-06-28 16:42:48 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-07-02 10:29:56 +0100 |
| commit | 06ea8e899e48f1f2f396b70e63fae369f2f23232 (patch) | |
| tree | 20c1428cd05c76f32394ab354ea35ed99acd86d8 /JavaScriptCore/runtime/JSImmediate.h | |
| parent | 72aad67af14193199e29cdd5c4ddc095a8b9a8a8 (diff) | |
| download | external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.zip external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.gz external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.bz2 | |
Merge WebKit at r61871: Initial merge by git.
Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
Diffstat (limited to 'JavaScriptCore/runtime/JSImmediate.h')
| -rw-r--r-- | JavaScriptCore/runtime/JSImmediate.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/JavaScriptCore/runtime/JSImmediate.h b/JavaScriptCore/runtime/JSImmediate.h index 9127b6a..f33d9fe 100644 --- a/JavaScriptCore/runtime/JSImmediate.h +++ b/JavaScriptCore/runtime/JSImmediate.h @@ -44,6 +44,8 @@ namespace JSC { class JSObject; class UString; + extern const size_t CELL_MASK; + #if USE(JSVALUE64) inline intptr_t reinterpretDoubleToIntptr(double value) { @@ -595,7 +597,13 @@ namespace JSC { inline bool JSValue::isCell() const { +#ifndef NDEBUG + bool r = !JSImmediate::isImmediate(asValue()); + ASSERT(!r || !(JSImmediate::rawValue(asValue()) & CELL_MASK)); + return r; +#else return !JSImmediate::isImmediate(asValue()); +#endif } inline bool JSValue::isInt32() const |