diff options
| author | Pale Moon <git-repo@palemoon.org> | 2015-11-04 16:14:20 +0100 |
|---|---|---|
| committer | Pale Moon <git-repo@palemoon.org> | 2015-11-04 16:14:20 +0100 |
| commit | 536efb88ae57f878089b43105d1fe9e4537a3efe (patch) | |
| tree | 2bb15ea983842da014ac1678abc0bb5a2a4fff4a /js | |
| parent | 124e977e734738dc3c40fb44cdf421c0b59404b3 (diff) | |
| download | palemoon-gre-536efb88ae57f878089b43105d1fe9e4537a3efe.tar.gz | |
Don't assert when hitting OOM; let it fall through in a known incorrect situation.
Diffstat (limited to 'js')
| -rw-r--r-- | js/src/jit/shared/CodeGenerator-shared.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/js/src/jit/shared/CodeGenerator-shared.cpp b/js/src/jit/shared/CodeGenerator-shared.cpp index efeb86089..096cb92f8 100644 --- a/js/src/jit/shared/CodeGenerator-shared.cpp +++ b/js/src/jit/shared/CodeGenerator-shared.cpp @@ -397,7 +397,8 @@ CodeGeneratorShared::ensureOsiSpace() for (int32_t i = 0; i < paddingSize; ++i) masm.nop(); } - JS_ASSERT(masm.currentOffset() - lastOsiPointOffset_ >= Assembler::patchWrite_NearCallSize()); + JS_ASSERT_IF(!masm.oom(), + masm.currentOffset() - lastOsiPointOffset_ >= Assembler::patchWrite_NearCallSize()); lastOsiPointOffset_ = masm.currentOffset(); } |