diff options
| author | Brian Smith <brian@dbsoft.org> | 2022-04-28 20:27:47 -0500 |
|---|---|---|
| committer | Brian Smith <brian@dbsoft.org> | 2022-04-28 20:27:47 -0500 |
| commit | d78e03d528ba9e7395160a23bce23726067600dd (patch) | |
| tree | e8314f3d55f136a6db6bb9e2a035ae68a04dc3e9 /js/src/wasm | |
| parent | bebeb4e26a35df99e19b6c44fc957ad6c14e9059 (diff) | |
| parent | 33523f5d5ed0c3b8000aae21a50a56c238422db3 (diff) | |
| download | uxp-d78e03d528ba9e7395160a23bce23726067600dd.tar.gz | |
Merge branch 'master' into 1829
* master:
No issue - Update README and SECURITY
Issue #1885 - Follow-up: Update error message if invalid rootMargin specified.
Issue #1879 - Follow-up: Update config/external/nss/target to security/target.
Issue #1885 - Allow unitless rootMargin entries for IntersectionObserver.
Issue #1879 - Revert changes to cryptox.h
Revert "Issue #1879 - spot-fix typo in cryptox.h"
Issue #1879 - spot-fix typo in cryptox.h
Issue #21 - Change MappedAttrParser to store its nsIPrincipal instead of nsSVGElement
Issue #21 - Remove use counters telemetry
Issue #1881 - Interpret empty or whitespace root margin string as zero length
Issue #1877 - Resolve NIGHTLY_BUILD conditionals.
Issue #1880 - Boot Comic Sans out of the font configuration.
Diffstat (limited to 'js/src/wasm')
| -rw-r--r-- | js/src/wasm/AsmJS.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/js/src/wasm/AsmJS.cpp b/js/src/wasm/AsmJS.cpp index f659c27ffa..8cbbff5370 100644 --- a/js/src/wasm/AsmJS.cpp +++ b/js/src/wasm/AsmJS.cpp @@ -1,6 +1,7 @@ /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * Copyright 2014 Mozilla Foundation + * Copyright 2022 Moonchild Productions * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -8546,9 +8547,7 @@ LookupAsmJSModuleInCache(ExclusiveContext* cx, AsmJSParser& parser, bool* loaded // Don't punish release users by crashing if there is a programmer error // here, just gracefully return with a cache miss. -#ifdef NIGHTLY_BUILD - MOZ_RELEASE_ASSERT(cursor == entry.memory + entry.serializedSize); -#endif + MOZ_ASSERT(cursor == entry.memory + entry.serializedSize); if (cursor != entry.memory + entry.serializedSize) return true; |