parent
77da8169fb
commit
ceb1d975dc
@ -1,102 +0,0 @@
|
||||
From cd2d6d61141416020ad2a93a8c55f88f13f4bbfa Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
|
||||
Date: Mon, 17 Feb 2020 16:06:52 +0100
|
||||
Subject: [PATCH] armv7: Disable LazyScript checks
|
||||
|
||||
---
|
||||
firefox-68.5.0/js/src/gc/Allocator.cpp | 6 ------
|
||||
firefox-68.5.0/js/src/gc/GC.cpp | 10 +---------
|
||||
firefox-68.5.0/js/src/vm/JSScript.h | 10 ----------
|
||||
firefox-68.5.0/js/src/vm/Shape.h | 3 ---
|
||||
2 files changed, 13 deletions(-)
|
||||
|
||||
diff --git a/firefox-68.0/js/src/gc/Allocator.cpp b/firefox-68.0/js/src/gc/Allocator.cpp
|
||||
index 52c19c32f3..a6780df0ce 100644
|
||||
--- firefox-68.0/js/src/gc/Allocator.cpp
|
||||
+++ firefox-68.0/js/src/gc/Allocator.cpp
|
||||
@@ -38,9 +38,6 @@ JSObject* js::AllocateObject(JSContext* cx, AllocKind kind,
|
||||
|
||||
MOZ_ASSERT(thingSize == Arena::thingSize(kind));
|
||||
MOZ_ASSERT(thingSize >= sizeof(JSObject_Slots0));
|
||||
- static_assert(
|
||||
- sizeof(JSObject_Slots0) >= MinCellSize,
|
||||
- "All allocations must be at least the allocator-imposed minimum size.");
|
||||
|
||||
MOZ_ASSERT_IF(nDynamicSlots != 0, clasp->isNative());
|
||||
|
||||
@@ -236,9 +233,6 @@ template <typename T, AllowGC allowGC /* = CanGC */>
|
||||
T* js::Allocate(JSContext* cx) {
|
||||
static_assert(!mozilla::IsConvertible<T*, JSObject*>::value,
|
||||
"must not be JSObject derived");
|
||||
- static_assert(
|
||||
- sizeof(T) >= MinCellSize,
|
||||
- "All allocations must be at least the allocator-imposed minimum size.");
|
||||
|
||||
AllocKind kind = MapTypeToFinalizeKind<T>::kind;
|
||||
size_t thingSize = sizeof(T);
|
||||
diff --git a/firefox-68.0/js/src/gc/GC.cpp b/firefox-68.0/js/src/gc/GC.cpp
|
||||
index b31847c0fb..26bddd8460 100644
|
||||
--- firefox-68.0/js/src/gc/GC.cpp
|
||||
+++ firefox-68.0/js/src/gc/GC.cpp
|
||||
@@ -429,15 +429,7 @@ static_assert(mozilla::ArrayLength(slotsToThingKind) ==
|
||||
"We have defined a slot count for each kind.");
|
||||
|
||||
#define CHECK_THING_SIZE(allocKind, traceKind, type, sizedType, bgFinal, \
|
||||
- nursery, compact) \
|
||||
- static_assert(sizeof(sizedType) >= SortedArenaList::MinThingSize, \
|
||||
- #sizedType " is smaller than SortedArenaList::MinThingSize!"); \
|
||||
- static_assert(sizeof(sizedType) >= sizeof(FreeSpan), \
|
||||
- #sizedType " is smaller than FreeSpan"); \
|
||||
- static_assert(sizeof(sizedType) % CellAlignBytes == 0, \
|
||||
- "Size of " #sizedType " is not a multiple of CellAlignBytes"); \
|
||||
- static_assert(sizeof(sizedType) >= MinCellSize, \
|
||||
- "Size of " #sizedType " is smaller than the minimum size");
|
||||
+ nursery, compact)
|
||||
FOR_EACH_ALLOCKIND(CHECK_THING_SIZE);
|
||||
#undef CHECK_THING_SIZE
|
||||
|
||||
diff --git a/js/src/vm/JSScript.h b/js/src/vm/JSScript.h
|
||||
index 6a446b9ac8..6b3d09f2b9 100644
|
||||
--- firefox-68.0/js/src/vm/JSScript.h
|
||||
+++ firefox-68.0/js/src/vm/JSScript.h
|
||||
@@ -2970,11 +2970,6 @@ class JSScript : public js::gc::TenuredCell {
|
||||
}
|
||||
};
|
||||
|
||||
-/* If this fails, add/remove padding within JSScript. */
|
||||
-static_assert(
|
||||
- sizeof(JSScript) % js::gc::CellAlignBytes == 0,
|
||||
- "Size of JSScript must be an integral multiple of js::gc::CellAlignBytes");
|
||||
-
|
||||
namespace js {
|
||||
|
||||
// Variable-length data for LazyScripts. Contains vector of inner functions and
|
||||
@@ -3404,11 +3399,6 @@ class LazyScript : public gc::TenuredCell {
|
||||
uint32_t immutableFlags() const { return immutableFlags_; }
|
||||
};
|
||||
|
||||
-/* If this fails, add/remove padding within LazyScript. */
|
||||
-static_assert(sizeof(LazyScript) % js::gc::CellAlignBytes == 0,
|
||||
- "Size of LazyScript must be an integral multiple of "
|
||||
- "js::gc::CellAlignBytes");
|
||||
-
|
||||
struct ScriptAndCounts {
|
||||
/* This structure is stored and marked from the JSRuntime. */
|
||||
JSScript* script;
|
||||
diff --git a/js/src/vm/Shape.h b/js/src/vm/Shape.h
|
||||
index 7c3b052317..2bda7f7f91 100644
|
||||
--- firefox-68.0/js/src/vm/Shape.h
|
||||
+++ firefox-68.0/js/src/vm/Shape.h
|
||||
@@ -804,9 +804,6 @@ class BaseShape : public gc::TenuredCell {
|
||||
static void staticAsserts() {
|
||||
JS_STATIC_ASSERT(offsetof(BaseShape, clasp_) ==
|
||||
offsetof(js::shadow::BaseShape, clasp_));
|
||||
- static_assert(sizeof(BaseShape) % gc::CellAlignBytes == 0,
|
||||
- "Things inheriting from gc::Cell must have a size that's "
|
||||
- "a multiple of gc::CellAlignBytes");
|
||||
}
|
||||
|
||||
void traceShapeCache(JSTracer* trc);
|
||||
--
|
||||
2.24.1
|
||||
|
@ -20,7 +20,7 @@
|
||||
|
||||
Name: mozjs%{major}
|
||||
Version: 68.5.0
|
||||
Release: 2%{?dist}
|
||||
Release: 1%{?dist}
|
||||
Summary: SpiderMonkey JavaScript library
|
||||
|
||||
License: MPLv2.0 and MPLv1.1 and BSD and GPLv2+ and GPLv3+ and LGPLv2+ and AFL and ASL 2.0
|
||||
@ -46,7 +46,6 @@ Patch15: spidermonkey_checks_disable.patch
|
||||
# armv7 fixes
|
||||
Patch16: rust_armv7.patch
|
||||
Patch17: armv7_disable_WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS.patch
|
||||
Patch18: armv7-Disable-LazyScript-checks.patch
|
||||
|
||||
# Patches from Fedora firefox package:
|
||||
Patch26: build-icu-big-endian.patch
|
||||
@ -109,7 +108,6 @@ pushd ../..
|
||||
# Disable WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS as it causes the compilation to fail
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=1526653
|
||||
%patch17 -p1
|
||||
%patch18 -p1
|
||||
%endif
|
||||
|
||||
# Patch for big endian platforms only
|
||||
@ -252,9 +250,6 @@ PYTHONPATH=tests/lib %{__python3} jit-test/jit_test.py -s -t 1800 --no-progress
|
||||
%{_includedir}/mozjs-%{major}/
|
||||
|
||||
%changelog
|
||||
* Wed Feb 19 2020 Frantisek Zatloukal <fzatlouk@redhat.com> - 68.5.0-2
|
||||
- GCC 10 workaround for armv7
|
||||
|
||||
* Mon Feb 10 2020 Frantisek Zatloukal <fzatlouk@redhat.com> - 68.5.0-1
|
||||
- Update to 68.5.0
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user