Changeset 34891 in webkit for trunk/JavaScriptCore/VM/CodeGenerator.h

Timestamp:

Jun 30, 2008, 8:58:27 AM (17 years ago)

Author:

Adam Roben

Message:

Fix <rdar://5954749> Assertion failure due to HashTable's use of operator&

JavaScriptCore:

Fix <rdar://5954749> Assertion failure due to HashTable's use of
operator&

HashTable was passing &value to constructDeletedValue, which in
classes like WebCore::COMPtr would cause an assertion. We now pass
value by reference instead of by address so that the HashTraits
implementations have more flexibility in constructing the deleted
value.

Reviewed by Ada Chan.

• VM/CodeGenerator.h: Updated for changes to HashTraits.
• wtf/HashTable.h: (WTF::::deleteBucket): Changed to pass bucket by reference instead of by address. (WTF::::checkKey): Ditto.
• wtf/HashTraits.h: (WTF::): Updated HashTraits for HashTable change.

WebCore:

Fix <rdar://5954749> Assertion failure due to HashTable's use of
operator&

Reviewed by Ada Chan.

• bindings/js/JSSVGPODTypeWrapper.h:
• dom/Document.h:
• dom/StyledElement.cpp:
• platform/graphics/FontCache.cpp:
• platform/graphics/IntSizeHash.h: (WTF::):
• platform/text/StringHash.h:
• platform/win/COMPtr.h:
• svg/SVGAnimatedTemplate.h: Updated all custom HashTraits for HashTable changes.

File:

• trunk/JavaScriptCore/VM/CodeGenerator.h (modified) (1 diff)

trunk/JavaScriptCore/VM/CodeGenerator.h

@@ -296 +296 @@
         PassRefPtr<LabelID> emitComplexJumpScopes(LabelID* target, ControlFlowContext* topScope, ControlFlowContext* bottomScope);
         struct JSValueHashTraits : HashTraits<JSValue*> {
-            static void constructDeletedValue(JSValue** slot) { *slot = JSImmediate::impossibleValue(); }
+            static void constructDeletedValue(JSValue*& slot) { slot = JSImmediate::impossibleValue(); }
             static bool isDeletedValue(JSValue* value) { return value == JSImmediate::impossibleValue(); }
         };