660630 - Only error once on OOM in NewCompartment

Status: RESOLVED FIXED

(Core :: JavaScript Engine, defect)

Description

[Paul Biggar]

Attachment: fix

We shouldn't be calling js_reportOutOfMemory error more than once. JSCompartment::init() does, and then NewCompartment does too. This removes the partial redundancy.

Comment 1

[Igor Bukanov]

Comment on attachment 536079 [details] [diff] [review]
fix

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

::: js/src/jsgc.cpp
@@ +2936,5 @@
>          AutoLockGC lock(rt);
>          if (rt->compartments.append(compartment))
>              return compartment;
> +        else
> +            JS_ReportOutOfMemory(cx);

1. Memory reporting must be done outside any lock.

2. Use js_ReportOutOfMemory.

3. No else after return

Comment 2

[Paul Biggar]

Attachment: with error reporting outseide lock

Comment 3

[Igor Bukanov]

Comment on attachment 536108 [details] [diff] [review]
with error reporting outseide lock

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

::: js/src/jsgc.cpp
@@ +2933,5 @@
>  
>          compartment->setGCLastBytes(8192);
>  
> +        {
> +            AutoLockGC lock(rt);

Comment that the extra block is for lock-less error reporting.

Comment 4

[Paul Biggar]

http://hg.mozilla.org/tracemonkey/rev/d6987081e730

Comment 5

[Paul Biggar]

cdleary-bot missed this.