1031482 - Restore Label's asserts

Status: RESOLVED FIXED

(Core :: JavaScript Engine: JIT, enhancement)

Description

[Dan Gohman [:sunfish]]

Attachment: label-asserts.patch

Bug 976446 moved LabelBase, Label, and NonAssertingLabel into their own header file, but dropped the Label class' assert -- the assert that NonAssertingLabel exists to suppress. Attached is a patch to restore the assert. If this isn't desired, we should delete the NonAssertingLabel class.

Comment 1

[Jan de Mooij [:jandem]]

Comment on attachment 8447369 [details] [diff] [review]
label-asserts.patch

Review of attachment 8447369 [details] [diff] [review]:
-----------------------------------------------------------------

Good catch. I didn't notice the asserts being removed as part of the move..

::: js/src/jit/Label.h
@@ +6,5 @@
>  
>  #ifndef jit_Label_h
>  #define jit_Label_h
>  
> +#include "jit/Ion.h"

Hm isn't this a cyclic include?

@@ +82,5 @@
> +#ifdef DEBUG
> +        // The assertion below doesn't hold if an error occurred.
> +        if (OOM_counter > OOM_maxAllocations)
> +            return;
> +        if (IonContext *context = MaybeGetIonContext())

Nit: add {}

Comment 2

[Jan de Mooij [:jandem]]

(In reply to Jan de Mooij [:jandem] from comment #1)
> Hm isn't this a cyclic include?

I thought Ion.h had more #includes but it's not too bad. Nevermind.

Comment 3

[Dan Gohman [:sunfish]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/b5cf6f6dfa83

Comment 4

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/b5cf6f6dfa83