Bug 224565 – Defer TerminationExceptions when evaluating ASSERT in HashMapIml::addNormalized().

• Status: RESOLVED
• Resolution: FIXED
• Component: JavaScriptCore

[Mark Lam]

rdar://76645980

[Mark Lam]

Created attachment 426026 [details]
proposed patch.

[Yusuke Suzuki]

Comment on attachment 426026 [details]
proposed patch.

View in context: https://bugs.webkit.org/attachment.cgi?id=426026&action=review

> Source/JavaScriptCore/runtime/ExceptionHelpers.h:72
> +#define DEFER_TERMINATION_AND_ASSERT(vm, assertion, ...) do { \
> +        JSC::DeferTerminationForAWhile deferScope(vm); \
> +        ASSERT(assertion, __VA_ARGS__); \
> +    } while (false)
> +
> +#define DEFER_TERMINATION_AND_ASSERT_WITH_MESSAGE(vm, assertion, ...) do { \
> +        JSC::DeferTerminationForAWhile deferScope(vm); \
> +        ASSERT_WITH_MESSAGE(assertion, __VA_ARGS__); \
> +    } while (false)

Let's make them nop for Release builds. JSC::DeferTerminationForAWhile is calling deferTermination / undoDeferTermination functions. And I think addNormalized is really critical enough so that we should not insert these calls.

[Mark Lam]

Created attachment 426046 [details]
proposed patch.

[Yusuke Suzuki]

Comment on attachment 426046 [details]
proposed patch.

View in context: https://bugs.webkit.org/attachment.cgi?id=426046&action=review

r=me

> Source/JavaScriptCore/runtime/VMTraps.h:194
> +    enum DeferAction {

Let’s use enum class.

[Mark Lam]

Thanks for the review.  I've made the enum class change.

Landed in r275969: <http://trac.webkit.org/r275969>.