tbb-commits October 2018

tbb-commits@lists.torproject.org

2 participants
79 discussions

[tor-browser-build/master] Bug 27865: Tor Browser 8.5a2 is crashing on Windows
by gk＠torproject.org 02 Oct '18

02 Oct '18

commit 49eb43da16695c8fce31129f3499a8258761025a Author: Georg Koppen <gk(a)torproject.org> Date: Tue Oct 2 03:04:05 2018 +0000 Bug 27865: Tor Browser 8.5a2 is crashing on Windows We disable the usage of MOZILLA_OFFICIAL again for Windows platforms as Tor Browser is crashing otherwise. The underlying reason is likely the same as in https://bugzilla.mozilla.org/show_bug.cgi?id=1470772. --- projects/firefox/mozconfig-windows-i686 | 1 - projects/firefox/mozconfig-windows-x86_64 | 1 - 2 files changed, 2 deletions(-) diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686 index 07e8851..a5e15f1 100644 --- a/projects/firefox/mozconfig-windows-i686 +++ b/projects/firefox/mozconfig-windows-i686 @@ -10,7 +10,6 @@ ac_add_options --enable-default-toolkit=cairo-windows mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 -export MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 ac_add_options --disable-debug diff --git a/projects/firefox/mozconfig-windows-x86_64 b/projects/firefox/mozconfig-windows-x86_64 index 1665005..e7f857d 100644 --- a/projects/firefox/mozconfig-windows-x86_64 +++ b/projects/firefox/mozconfig-windows-x86_64 @@ -10,7 +10,6 @@ ac_add_options --enable-default-toolkit=cairo-windows mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 -export MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 ac_add_options --disable-debug

1 0

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 27865: Fix start-up crashes on Windows
by gk＠torproject.org 01 Oct '18

01 Oct '18

commit 06750f24d6c10d12158d2402361e3ce71d8493e1 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Sep 30 17:53:00 2018 +0000 Bug 27865: Fix start-up crashes on Windows Don't bind --enable-release to MOZILLA_OFFICIAL for Windows targets as we are currently crashing on start-up for unknown reasons if --enable-release is set, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1470772. --- build/moz.configure/toolchain.configure | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure index 67007c8dcf7c..008193c6c945 100755 --- a/build/moz.configure/toolchain.configure +++ b/build/moz.configure/toolchain.configure @@ -1382,8 +1382,10 @@ option(env='RUSTFLAGS', help='Rust compiler flags') set_config('RUSTFLAGS', depends('RUSTFLAGS')(lambda flags: flags)) - -imply_option('--enable-release', mozilla_official) +if target.os != 'WINNT': + imply_option('--enable-release', mozilla_official) +else: + imply_option('--enable-release', False) imply_option('--enable-release', depends_if('MOZ_AUTOMATION')(lambda x: True)) js_option('--enable-release',

1 0

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 1493903 - Don't inline push with more than 1 argument. r=tcampbell a=dveditz
by gk＠torproject.org 01 Oct '18

01 Oct '18

commit 50e3be5d0c750483f8e2367cb8b8e0c3c26bba11 Author: Jan de Mooij <jdemooij(a)mozilla.com> Date: Tue Sep 25 12:33:42 2018 +0200 Bug 1493903 - Don't inline push with more than 1 argument. r=tcampbell a=dveditz --HG-- extra : source : b193307614e2f56615e7b5fe5ca97c2f6638c29d extra : intermediate-source : dc688e0c970278799f4d0ca9bde78545380e4110 --- js/src/jit/MCallOptimize.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/js/src/jit/MCallOptimize.cpp b/js/src/jit/MCallOptimize.cpp index 2bee4b605280..1e600583c4cb 100644 --- a/js/src/jit/MCallOptimize.cpp +++ b/js/src/jit/MCallOptimize.cpp @@ -775,6 +775,12 @@ IonBuilder::inlineArrayPush(CallInfo& callInfo) return InliningStatus_NotInlined; } + // XXX bug 1493903. + if (callInfo.argc() != 1) { + trackOptimizationOutcome(TrackedOutcome::CantInlineNativeBadForm); + return InliningStatus_NotInlined; + } + MDefinition* obj = convertUnboxedObjects(callInfo.thisArg()); for (uint32_t i = 0; i < callInfo.argc(); i++) { MDefinition* value = callInfo.getArg(i);

1 0

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 1489785: Remove a workaround for gcc, introduced in bug 678607, that is no longer needed and that causes hangs in modal dialogs on macOS 10.14. r=mstange, a=jcristau
by gk＠torproject.org 01 Oct '18

01 Oct '18

commit 0c004047822a94a6e16851a9f46d237be10eebce Author: Stephen A Pohl <spohl.mozilla.bugs(a)gmail.com> Date: Sun Sep 30 01:02:08 2018 -0400 Bug 1489785: Remove a workaround for gcc, introduced in bug 678607, that is no longer needed and that causes hangs in modal dialogs on macOS 10.14. r=mstange, a=jcristau --HG-- extra : source : 3920c858319dff66ebbc9263f6aa8d24f16071f8 extra : intermediate-source : d7a52857cd862b4e2f8305baddc119f4e9a47146 --- widget/cocoa/nsChildView.mm | 52 --------------------------------------------- 1 file changed, 52 deletions(-) diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm index 8ffafc5d148e..072d59d0c010 100644 --- a/widget/cocoa/nsChildView.mm +++ b/widget/cocoa/nsChildView.mm @@ -442,13 +442,6 @@ nsChildView::Create(nsIWidget* aParent, if (!gChildViewMethodsSwizzled) { nsToolkit::SwizzleMethods([NSView class], @selector(mouseDownCanMoveWindow), @selector(nsChildView_NSView_mouseDownCanMoveWindow)); -#ifdef __LP64__ - nsToolkit::SwizzleMethods([NSEvent class], @selector(addLocalMonitorForEventsMatchingMask:handler:), - @selector(nsChildView_NSEvent_addLocalMonitorForEventsMatchingMask:handler:), - true); - nsToolkit::SwizzleMethods([NSEvent class], @selector(removeMonitor:), - @selector(nsChildView_NSEvent_removeMonitor:), true); -#endif gChildViewMethodsSwizzled = true; } @@ -7134,48 +7127,3 @@ static const CGEventField kCGWindowNumberField = (const CGEventField) 51; } @end - -#ifdef __LP64__ -// When using blocks, at least on OS X 10.7, the OS sometimes calls -// +[NSEvent removeMonitor:] more than once on a single event monitor, which -// causes crashes. See bug 678607. We hook these methods to work around -// the problem. -@interface NSEvent (MethodSwizzling) -+ (id)nsChildView_NSEvent_addLocalMonitorForEventsMatchingMask:(unsigned long long)mask handler:(id)block; -+ (void)nsChildView_NSEvent_removeMonitor:(id)eventMonitor; -@end - -// This is a local copy of the AppKit frameworks sEventObservers hashtable. -// It only stores "local monitors". We use it to ensure that +[NSEvent -// removeMonitor:] is never called more than once on the same local monitor. -static NSHashTable *sLocalEventObservers = nil; - -@implementation NSEvent (MethodSwizzling) - -+ (id)nsChildView_NSEvent_addLocalMonitorForEventsMatchingMask:(unsigned long long)mask handler:(id)block -{ - if (!sLocalEventObservers) { - sLocalEventObservers = [[NSHashTable hashTableWithOptions: - NSHashTableStrongMemory | NSHashTableObjectPointerPersonality] retain]; - } - id retval = - [self nsChildView_NSEvent_addLocalMonitorForEventsMatchingMask:mask handler:block]; - if (sLocalEventObservers && retval && ![sLocalEventObservers containsObject:retval]) { - [sLocalEventObservers addObject:retval]; - } - return retval; -} - -+ (void)nsChildView_NSEvent_removeMonitor:(id)eventMonitor -{ - if (sLocalEventObservers && [eventMonitor isKindOfClass: ::NSClassFromString(@"_NSLocalEventObserver")]) { - if (![sLocalEventObservers containsObject:eventMonitor]) { - return; - } - [sLocalEventObservers removeObject:eventMonitor]; - } - [self nsChildView_NSEvent_removeMonitor:eventMonitor]; -} - -@end -#endif // #ifdef __LP64__

1 0

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 1493900. r=bhackett, sunfish a=dveditz
by gk＠torproject.org 01 Oct '18

01 Oct '18

commit 34bcbdca41c7949318930b44b504e88696d0aeee Author: Jan de Mooij <jdemooij(a)mozilla.com> Date: Tue Sep 25 12:14:11 2018 +0200 Bug 1493900. r=bhackett,sunfish a=dveditz --HG-- extra : source : b5e3f4138c0ca0a2a42ec8007f27e1e7b6cb2150 extra : intermediate-source : d596c94e62cd99b7efa048cb8016368047aaa079 --- js/src/jit/BacktrackingAllocator.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/js/src/jit/BacktrackingAllocator.cpp b/js/src/jit/BacktrackingAllocator.cpp index 16f7ff56397c..414de92e5bbc 100644 --- a/js/src/jit/BacktrackingAllocator.cpp +++ b/js/src/jit/BacktrackingAllocator.cpp @@ -1930,8 +1930,16 @@ BacktrackingAllocator::resolveControlFlow() if (!alloc().ensureBallast()) return false; - if (!moveAtExit(predecessor, from, to, def->type())) - return false; + if (mSuccessor->numPredecessors() > 1) { + MOZ_ASSERT(predecessor->mir()->numSuccessors() == 1); + if (!moveAtExit(predecessor, from, to, def->type())) { + return false; + } + } else { + if (!moveAtEntry(successor, from, to, def->type())) { + return false; + } + } } } }

1 0

[tor-browser-build/maint-8.0] Release preparations for 8.0.2
by gk＠torproject.org 01 Oct '18

01 Oct '18

commit 477884d77cfa213307db56c2cb60eee8575865d4 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Oct 1 13:05:57 2018 +0000 Release preparations for 8.0.2 Version bumps and Changelog update --- projects/firefox/config | 4 ++-- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 7 +++++++ rbm.conf | 6 +++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 9d675eb..debff32 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,13 +1,13 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build5' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg var: - firefox_platform_version: 60.2.0 + firefox_platform_version: 60.2.1 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 8.0 torbrowser_update_channel: alpha diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 0c7d943..ec0bf46 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,10 @@ +Tor Browser 8.0.2 -- October 2 2018 + * All platforms + * Update Firefox to 60.2.1esr + * Backport fix for Mozilla bug 1493900 and 1493903 + * OS X + * Backport fix for Mozilla bug 1489785 for macOS 10.14 compatibility + Tor Browser 8.0.1 -- September 24 2018 * All platforms * Update Tor to 0.3.4.8 diff --git a/rbm.conf b/rbm.conf index 9f10ba5..fbc9776 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.0.1' - torbrowser_build: 'build3' + torbrowser_version: '8.0.2' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 8.0 + - 8.0.1 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser/tor-browser-60.2.1esr-8.0-1] Bug 1493900. r=bhackett, sunfish a=dveditz
by gk＠torproject.org 01 Oct '18

01 Oct '18

commit 3943f44464ab5aa6bf92b3326cd99479779a83c7 Author: Jan de Mooij <jdemooij(a)mozilla.com> Date: Tue Sep 25 12:14:11 2018 +0200 Bug 1493900. r=bhackett,sunfish a=dveditz --HG-- extra : source : b5e3f4138c0ca0a2a42ec8007f27e1e7b6cb2150 extra : intermediate-source : d596c94e62cd99b7efa048cb8016368047aaa079 --- js/src/jit/BacktrackingAllocator.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/js/src/jit/BacktrackingAllocator.cpp b/js/src/jit/BacktrackingAllocator.cpp index 16f7ff56397c..414de92e5bbc 100644 --- a/js/src/jit/BacktrackingAllocator.cpp +++ b/js/src/jit/BacktrackingAllocator.cpp @@ -1930,8 +1930,16 @@ BacktrackingAllocator::resolveControlFlow() if (!alloc().ensureBallast()) return false; - if (!moveAtExit(predecessor, from, to, def->type())) - return false; + if (mSuccessor->numPredecessors() > 1) { + MOZ_ASSERT(predecessor->mir()->numSuccessors() == 1); + if (!moveAtExit(predecessor, from, to, def->type())) { + return false; + } + } else { + if (!moveAtEntry(successor, from, to, def->type())) { + return false; + } + } } } }

1 0

[tor-browser/tor-browser-60.2.1esr-8.0-1] Bug 1489785: Remove a workaround for gcc, introduced in bug 678607, that is no longer needed and that causes hangs in modal dialogs on macOS 10.14. r=mstange, a=jcristau
by gk＠torproject.org 01 Oct '18

01 Oct '18

commit f3a77068c18589f124c8ad4697476b11b4fada6a Author: Stephen A Pohl <spohl.mozilla.bugs(a)gmail.com> Date: Sun Sep 30 01:02:08 2018 -0400 Bug 1489785: Remove a workaround for gcc, introduced in bug 678607, that is no longer needed and that causes hangs in modal dialogs on macOS 10.14. r=mstange, a=jcristau --HG-- extra : source : 3920c858319dff66ebbc9263f6aa8d24f16071f8 extra : intermediate-source : d7a52857cd862b4e2f8305baddc119f4e9a47146 --- widget/cocoa/nsChildView.mm | 52 --------------------------------------------- 1 file changed, 52 deletions(-) diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm index 8ffafc5d148e..072d59d0c010 100644 --- a/widget/cocoa/nsChildView.mm +++ b/widget/cocoa/nsChildView.mm @@ -442,13 +442,6 @@ nsChildView::Create(nsIWidget* aParent, if (!gChildViewMethodsSwizzled) { nsToolkit::SwizzleMethods([NSView class], @selector(mouseDownCanMoveWindow), @selector(nsChildView_NSView_mouseDownCanMoveWindow)); -#ifdef __LP64__ - nsToolkit::SwizzleMethods([NSEvent class], @selector(addLocalMonitorForEventsMatchingMask:handler:), - @selector(nsChildView_NSEvent_addLocalMonitorForEventsMatchingMask:handler:), - true); - nsToolkit::SwizzleMethods([NSEvent class], @selector(removeMonitor:), - @selector(nsChildView_NSEvent_removeMonitor:), true); -#endif gChildViewMethodsSwizzled = true; } @@ -7134,48 +7127,3 @@ static const CGEventField kCGWindowNumberField = (const CGEventField) 51; } @end - -#ifdef __LP64__ -// When using blocks, at least on OS X 10.7, the OS sometimes calls -// +[NSEvent removeMonitor:] more than once on a single event monitor, which -// causes crashes. See bug 678607. We hook these methods to work around -// the problem. -@interface NSEvent (MethodSwizzling) -+ (id)nsChildView_NSEvent_addLocalMonitorForEventsMatchingMask:(unsigned long long)mask handler:(id)block; -+ (void)nsChildView_NSEvent_removeMonitor:(id)eventMonitor; -@end - -// This is a local copy of the AppKit frameworks sEventObservers hashtable. -// It only stores "local monitors". We use it to ensure that +[NSEvent -// removeMonitor:] is never called more than once on the same local monitor. -static NSHashTable *sLocalEventObservers = nil; - -@implementation NSEvent (MethodSwizzling) - -+ (id)nsChildView_NSEvent_addLocalMonitorForEventsMatchingMask:(unsigned long long)mask handler:(id)block -{ - if (!sLocalEventObservers) { - sLocalEventObservers = [[NSHashTable hashTableWithOptions: - NSHashTableStrongMemory | NSHashTableObjectPointerPersonality] retain]; - } - id retval = - [self nsChildView_NSEvent_addLocalMonitorForEventsMatchingMask:mask handler:block]; - if (sLocalEventObservers && retval && ![sLocalEventObservers containsObject:retval]) { - [sLocalEventObservers addObject:retval]; - } - return retval; -} - -+ (void)nsChildView_NSEvent_removeMonitor:(id)eventMonitor -{ - if (sLocalEventObservers && [eventMonitor isKindOfClass: ::NSClassFromString(@"_NSLocalEventObserver")]) { - if (![sLocalEventObservers containsObject:eventMonitor]) { - return; - } - [sLocalEventObservers removeObject:eventMonitor]; - } - [self nsChildView_NSEvent_removeMonitor:eventMonitor]; -} - -@end -#endif // #ifdef __LP64__

1 0

[tor-browser/tor-browser-60.2.1esr-8.0-1] Bug 1493903 - Don't inline push with more than 1 argument. r=tcampbell a=dveditz
by gk＠torproject.org 01 Oct '18

01 Oct '18

commit 19a1fbba648f1dd12e7bfc31f7c3f82cfc89cf33 Author: Jan de Mooij <jdemooij(a)mozilla.com> Date: Tue Sep 25 12:33:42 2018 +0200 Bug 1493903 - Don't inline push with more than 1 argument. r=tcampbell a=dveditz --HG-- extra : source : b193307614e2f56615e7b5fe5ca97c2f6638c29d extra : intermediate-source : dc688e0c970278799f4d0ca9bde78545380e4110 --- js/src/jit/MCallOptimize.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/js/src/jit/MCallOptimize.cpp b/js/src/jit/MCallOptimize.cpp index 2bee4b605280..1e600583c4cb 100644 --- a/js/src/jit/MCallOptimize.cpp +++ b/js/src/jit/MCallOptimize.cpp @@ -775,6 +775,12 @@ IonBuilder::inlineArrayPush(CallInfo& callInfo) return InliningStatus_NotInlined; } + // XXX bug 1493903. + if (callInfo.argc() != 1) { + trackOptimizationOutcome(TrackedOutcome::CantInlineNativeBadForm); + return InliningStatus_NotInlined; + } + MDefinition* obj = convertUnboxedObjects(callInfo.thisArg()); for (uint32_t i = 0; i < callInfo.argc(); i++) { MDefinition* value = callInfo.getArg(i);

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits October 2018