mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-05 23:38:38 +09:00
Merge remote-tracking branch 'origin/tracking' into custom
This commit is contained in:
commit
2b0cdc7b62
18 changed files with 104 additions and 37 deletions
|
|
@ -100,8 +100,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
|||
|
||||
#define ffi_call_SYSV_FS (8 * 4)
|
||||
|
||||
.cfi_startproc
|
||||
CNAME(ffi_call_SYSV):
|
||||
.cfi_startproc
|
||||
stp x29, x30, [sp, #-16]!
|
||||
cfi_adjust_cfa_offset (16)
|
||||
cfi_rel_offset (x29, 0)
|
||||
|
|
@ -247,8 +247,8 @@ CNAME(ffi_call_SYSV):
|
|||
#ifdef __APPLE__
|
||||
.align 2
|
||||
#endif
|
||||
.cfi_startproc
|
||||
CNAME(ffi_closure_SYSV):
|
||||
.cfi_startproc
|
||||
stp x29, x30, [sp, #-16]!
|
||||
cfi_adjust_cfa_offset (16)
|
||||
cfi_rel_offset (x29, 0)
|
||||
|
|
|
|||
|
|
@ -362,10 +362,7 @@ TokenStream::SourceCoords::add(uint32_t lineNum, uint32_t lineStartOffset)
|
|||
|
||||
lineStartOffsets_[lineIndex] = lineStartOffset;
|
||||
} else {
|
||||
// We have seen this newline before (and ungot it). Do nothing (other
|
||||
// than checking it hasn't mysteriously changed).
|
||||
// This path can be executed after hitting OOM, so check lineIndex.
|
||||
MOZ_ASSERT_IF(lineIndex < sentinelIndex, lineStartOffsets_[lineIndex] == lineStartOffset);
|
||||
// We have seen this newline before (and ungot it). Do nothing.
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
|
@ -615,7 +612,6 @@ TokenStream::ungetChar(int32_t c)
|
|||
if (!userbuf.atStart())
|
||||
userbuf.matchRawCharBackwards('\r');
|
||||
|
||||
MOZ_ASSERT(prevLinebase != size_t(-1)); // we should never get more than one EOL char
|
||||
linebase = prevLinebase;
|
||||
prevLinebase = size_t(-1);
|
||||
lineno--;
|
||||
|
|
|
|||
|
|
@ -325,7 +325,7 @@ AtomicOperations::isLockfree(int32_t size)
|
|||
# include "jit/arm64/AtomicOperations-arm64.h"
|
||||
#elif defined(JS_CODEGEN_MIPS32) || defined(JS_CODEGEN_MIPS64)
|
||||
# include "jit/mips-shared/AtomicOperations-mips-shared.h"
|
||||
#elif defined(__ppc__) || defined(__PPC__)
|
||||
#elif defined(__ppc__) || defined(__PPC__) || defined(__powerpc__)
|
||||
# include "jit/none/AtomicOperations-ppc.h"
|
||||
#elif defined(__sparc__)
|
||||
# include "jit/none/AtomicOperations-sparc.h"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue