1 # HG changeset patch |
1 # HG changeset patch |
2 # User Wolfgang Rosenauer <wr@rosenauer.org> |
2 # User Wolfgang Rosenauer <wr@rosenauer.org> |
3 # Parent 02ffee15578fd4dc2dd5ade32e7dab907d633b0d |
3 # Parent 855b1f176633af8ae11c0d791c8b33e9a2ae88e0 |
4 |
4 |
5 diff --git a/build/moz.configure/lto-pgo.configure b/build/moz.configure/lto-pgo.configure |
5 diff --git a/build/moz.configure/lto-pgo.configure b/build/moz.configure/lto-pgo.configure |
6 --- a/build/moz.configure/lto-pgo.configure |
6 --- a/build/moz.configure/lto-pgo.configure |
7 +++ b/build/moz.configure/lto-pgo.configure |
7 +++ b/build/moz.configure/lto-pgo.configure |
8 @@ -242,34 +242,34 @@ def lto( |
8 @@ -242,34 +242,34 @@ def lto( |
46 diff --git a/build/pgo/profileserver.py b/build/pgo/profileserver.py |
46 diff --git a/build/pgo/profileserver.py b/build/pgo/profileserver.py |
47 --- a/build/pgo/profileserver.py |
47 --- a/build/pgo/profileserver.py |
48 +++ b/build/pgo/profileserver.py |
48 +++ b/build/pgo/profileserver.py |
49 @@ -6,17 +6,17 @@ |
49 @@ -6,17 +6,17 @@ |
50 |
50 |
|
51 import glob |
51 import json |
52 import json |
52 import os |
53 import os |
|
54 import subprocess |
53 import sys |
55 import sys |
54 import glob |
|
55 import subprocess |
|
56 |
56 |
57 import mozcrash |
57 import mozcrash |
58 -from mozbuild.base import MozbuildObject, BinaryNotFoundException |
58 -from mozbuild.base import BinaryNotFoundException, MozbuildObject |
59 +from mozbuild.base import MozbuildObject, BinaryNotFoundException, BuildEnvironmentNotFoundException |
59 +from mozbuild.base import BinaryNotFoundException, MozbuildObject, BuildEnvironmentNotFoundException |
60 from mozfile import TemporaryDirectory |
60 from mozfile import TemporaryDirectory |
61 from mozhttpd import MozHttpd |
61 from mozhttpd import MozHttpd |
62 from mozprofile import FirefoxProfile, Preferences |
62 from mozprofile import FirefoxProfile, Preferences |
63 from mozprofile.permissions import ServerLocations |
63 from mozprofile.permissions import ServerLocations |
64 from mozrunner import FirefoxRunner, CLI |
64 from mozrunner import CLI, FirefoxRunner |
65 from six import string_types |
65 from six import string_types |
66 |
66 |
67 PORT = 8888 |
67 PORT = 8888 |
68 @@ -82,19 +82,32 @@ if __name__ == "__main__": |
68 @@ -82,19 +82,32 @@ if __name__ == "__main__": |
69 docroot=os.path.join(build.topsrcdir, "build", "pgo"), |
69 docroot=os.path.join(build.topsrcdir, "build", "pgo"), |
99 profile_data_dir = os.path.join(build.topsrcdir, "testing", "profiles") |
99 profile_data_dir = os.path.join(build.topsrcdir, "testing", "profiles") |
100 with open(os.path.join(profile_data_dir, "profiles.json"), "r") as fh: |
100 with open(os.path.join(profile_data_dir, "profiles.json"), "r") as fh: |
101 base_profiles = json.load(fh)["profileserver"] |
101 base_profiles = json.load(fh)["profileserver"] |
102 |
102 |
103 prefpaths = [ |
103 prefpaths = [ |
104 @@ -207,16 +220,20 @@ if __name__ == "__main__": |
104 @@ -208,16 +221,20 @@ if __name__ == "__main__": |
105 |
105 |
106 # Try to move the crash reports to the artifacts even if Firefox appears |
106 # Try to move the crash reports to the artifacts even if Firefox appears |
107 # to exit successfully, in case there's a crash that doesn't set the |
107 # to exit successfully, in case there's a crash that doesn't set the |
108 # return code to non-zero for some reason. |
108 # return code to non-zero for some reason. |
109 if get_crashreports(profilePath, name="Firefox exited successfully?") != 0: |
109 if get_crashreports(profilePath, name="Firefox exited successfully?") != 0: |
164 + |
164 + |
165 +CXXFLAGS += ['-fno-devirtualize'] |
165 +CXXFLAGS += ['-fno-devirtualize'] |
166 diff --git a/toolkit/components/terminator/nsTerminator.cpp b/toolkit/components/terminator/nsTerminator.cpp |
166 diff --git a/toolkit/components/terminator/nsTerminator.cpp b/toolkit/components/terminator/nsTerminator.cpp |
167 --- a/toolkit/components/terminator/nsTerminator.cpp |
167 --- a/toolkit/components/terminator/nsTerminator.cpp |
168 +++ b/toolkit/components/terminator/nsTerminator.cpp |
168 +++ b/toolkit/components/terminator/nsTerminator.cpp |
169 @@ -461,16 +461,21 @@ void nsTerminator::StartWatchdog() { |
169 @@ -455,16 +455,21 @@ void nsTerminator::StartWatchdog() { |
170 // Defend against overflow |
170 // Defend against overflow |
171 crashAfterMS = INT32_MAX; |
171 crashAfterMS = INT32_MAX; |
172 } else { |
172 } else { |
173 crashAfterMS *= scaleUp; |
173 crashAfterMS *= scaleUp; |
174 } |
174 } |