Changeset 27221 in webkit for trunk/JavaScriptCore/wtf/HashTable.h

Timestamp:

Oct 29, 2007, 1:44:44 AM (18 years ago)

Author:

mjs

Message:

JavaScriptCore:

Reviewed by Mark.

• re-enable asserts for access to empty or deleted keys

• wtf/HashTable.h: (WTF::::lookup): (WTF::::lookupForWriting): (WTF::::fullLookupForWriting): (WTF::::add):

WebCore:

Reviewed by Mark.

• fixed assertion failures detected by the new assertions

• bindings/objc/DOMRGBColor.mm: (-[DOMRGBColor dealloc]): Clear _internal before calling [super dealloc] because it's not a pointer and shouldn't be in the normal wrapper cache.
• dom/Document.cpp: (WebCore::Document::addImageMap): Don't access hashmap if name is null. (WebCore::Document::removeImageMap): ditto
• dom/StyledElement.cpp: (WebCore::StyledElement::parseMappedAttribute): Don't claim we have a class when the class attribute is empty.
• platform/TextCodecICU.cpp: (WebCore::gbkCallbackEscape): Don't look up 0 code points.

File:

• trunk/JavaScriptCore/wtf/HashTable.h (modified) (4 diffs)

trunk/JavaScriptCore/wtf/HashTable.h

@@ -403 +403 @@
     {
         ASSERT(m_table);
-#if !ASSERT_DISABLED && 0
+#if !ASSERT_DISABLED
         if (HashFunctions::safeToCompareToEmptyOrDeleted) {
             ASSERT(!HashTranslator::equal(KeyTraits::emptyValue(), key));
@@ -453 +453 @@
     {
         ASSERT(m_table);
-#if !ASSERT_DISABLED && 0
+#if !ASSERT_DISABLED
         if (HashFunctions::safeToCompareToEmptyOrDeleted) {
             ASSERT(!HashTranslator::equal(KeyTraits::emptyValue(), key));
@@ -510 +510 @@
     {
         ASSERT(m_table);
-#if !ASSERT_DISABLED && 0
+#if !ASSERT_DISABLED
         if (HashFunctions::safeToCompareToEmptyOrDeleted) {
             ASSERT(!HashTranslator::equal(KeyTraits::emptyValue(), key));
@@ -566 +566 @@
     inline pair<typename HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits>::iterator, bool> HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits>::add(const T& key, const Extra& extra)
     {
-#if !ASSERT_DISABLED && 0
+#if !ASSERT_DISABLED
         if (HashFunctions::safeToCompareToEmptyOrDeleted) {
             ASSERT(!HashTranslator::equal(KeyTraits::emptyValue(), key));