Fixed rhbz-1354671.patch

This commit is contained in:
Jan Horak 2017-04-27 13:10:48 +02:00
parent 84aecf83e0
commit 816a052bf4
2 changed files with 8 additions and 12 deletions

View File

@ -321,9 +321,9 @@ cd %{tarballdir}
%patch224 -p1 -b .1170092 %patch224 -p1 -b .1170092
%patch225 -p1 -b .1005640-accept-lang %patch225 -p1 -b .1005640-accept-lang
#ARM run-time patch #ARM run-time patch
%ifarch aarch64 #TEMP %ifarch aarch64
%patch226 -p1 -b .1354671 %patch226 -p1 -b .1354671
%endif #%endif
%patch227 -p1 -b .rh1400293 %patch227 -p1 -b .rh1400293
%patch229 -p1 -b .nss-version %patch229 -p1 -b .nss-version

View File

@ -1,16 +1,12 @@
@@ -, +, @@ diff -up firefox-53.0/layout/base/nsIPresShell.h.1354671 firefox-53.0/layout/base/nsIPresShell.h
--- --- firefox-53.0/layout/base/nsIPresShell.h.1354671 2017-04-27 13:07:43.808653320 +0200
layout/base/nsIPresShell.h | 2 +- +++ firefox-53.0/layout/base/nsIPresShell.h 2017-04-27 13:09:40.404427641 +0200
1 file changed, 1 insertion(+), 1 deletion(-) @@ -212,7 +212,7 @@ public:
--- a/layout/base/nsIPresShell.h * to the same aSize value. AllocateFrame is infallible and will abort
+++ a/layout/base/nsIPresShell.h * on out-of-memory.
@@ -224,7 +224,7 @@ public:
* to the same aSize value. AllocateFrame returns zero-filled memory.
* AllocateFrame is infallible and will abort on out-of-memory.
*/ */
- void* AllocateFrame(nsQueryFrame::FrameIID aID, size_t aSize) - void* AllocateFrame(nsQueryFrame::FrameIID aID, size_t aSize)
+ void* __attribute__((optimize("no-lifetime-dse"))) AllocateFrame(nsQueryFrame::FrameIID aID, size_t aSize) + void* __attribute__((optimize("no-lifetime-dse"))) AllocateFrame(nsQueryFrame::FrameIID aID, size_t aSize)
{ {
void* result = mFrameArena.AllocateByFrameID(aID, aSize); void* result = mFrameArena.AllocateByFrameID(aID, aSize);
RecordAlloc(result); RecordAlloc(result);
--