mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-21 01:05:45 +00:00
256c124f94
This was done by:
This was done by applying:
```
diff --git a/python/mozbuild/mozbuild/code-analysis/mach_commands.py b/python/mozbuild/mozbuild/code-analysis/mach_commands.py
index 789affde7bbf..fe33c4c7d4d1 100644
--- a/python/mozbuild/mozbuild/code-analysis/mach_commands.py
+++ b/python/mozbuild/mozbuild/code-analysis/mach_commands.py
@@ -2007,7 +2007,7 @@ class StaticAnalysis(MachCommandBase):
from subprocess import Popen, PIPE, check_output, CalledProcessError
diff_process = Popen(self._get_clang_format_diff_command(commit), stdout=PIPE)
- args = [sys.executable, clang_format_diff, "-p1", "-binary=%s" % clang_format]
+ args = [sys.executable, clang_format_diff, "-p1", "-binary=%s" % clang_format, '-sort-includes']
if not output_file:
args.append("-i")
```
Then running `./mach clang-format -c <commit-hash>`
Then undoing that patch.
Then running check_spidermonkey_style.py --fixup
Then running `./mach clang-format`
I had to fix four things:
* I needed to move <utility> back down in GuardObjects.h because I was hitting
obscure problems with our system include wrappers like this:
0:03.94 /usr/include/stdlib.h:550:14: error: exception specification in declaration does not match previous declaration
0:03.94 extern void *realloc (void *__ptr, size_t __size)
0:03.94 ^
0:03.94 /home/emilio/src/moz/gecko-2/obj-debug/dist/include/malloc_decls.h:53:1: note: previous declaration is here
0:03.94 MALLOC_DECL(realloc, void*, void*, size_t)
0:03.94 ^
0:03.94 /home/emilio/src/moz/gecko-2/obj-debug/dist/include/mozilla/mozalloc.h:22:32: note: expanded from macro 'MALLOC_DECL'
0:03.94 MOZ_MEMORY_API return_type name##_impl(__VA_ARGS__);
0:03.94 ^
0:03.94 <scratch space>:178:1: note: expanded from here
0:03.94 realloc_impl
0:03.94 ^
0:03.94 /home/emilio/src/moz/gecko-2/obj-debug/dist/include/mozmemory_wrap.h:142:41: note: expanded from macro 'realloc_impl'
0:03.94 #define realloc_impl mozmem_malloc_impl(realloc)
Which I really didn't feel like digging into.
* I had to restore the order of TrustOverrideUtils.h and related files in nss
because the .inc files depend on TrustOverrideUtils.h being included earlier.
* I had to add a missing include to RollingNumber.h
* Also had to partially restore include order in JsepSessionImpl.cpp to avoid
some -WError issues due to some static inline functions being defined in a
header but not used in the rest of the compilation unit.
Differential Revision: https://phabricator.services.mozilla.com/D60327
--HG--
extra : moz-landing-system : lando
|
||
|---|---|---|
| .. | ||
| AbstractEventQueue.h | ||
| AbstractThread.cpp | ||
| AbstractThread.h | ||
| BlockingResourceBase.cpp | ||
| BlockingResourceBase.h | ||
| components.conf | ||
| CondVar.h | ||
| CPUUsageWatcher.cpp | ||
| CPUUsageWatcher.h | ||
| DataMutex.h | ||
| DeadlockDetector.h | ||
| EventQueue.cpp | ||
| EventQueue.h | ||
| IdlePeriodState.cpp | ||
| IdlePeriodState.h | ||
| IdleTaskRunner.cpp | ||
| IdleTaskRunner.h | ||
| InputEventStatistics.cpp | ||
| InputEventStatistics.h | ||
| LazyIdleThread.cpp | ||
| LazyIdleThread.h | ||
| LeakRefPtr.h | ||
| MainThreadIdlePeriod.cpp | ||
| MainThreadIdlePeriod.h | ||
| MainThreadQueue.h | ||
| MainThreadUtils.h | ||
| Monitor.h | ||
| moz.build | ||
| MozPromise.h | ||
| MozPromiseInlines.h | ||
| Mutex.h | ||
| nsEnvironment.cpp | ||
| nsEnvironment.h | ||
| nsICancelableRunnable.h | ||
| nsIEnvironment.idl | ||
| nsIEventTarget.idl | ||
| nsIIdlePeriod.idl | ||
| nsIIdleRunnable.h | ||
| nsINamed.idl | ||
| nsIProcess.idl | ||
| nsIRunnable.idl | ||
| nsISerialEventTarget.idl | ||
| nsISupportsPriority.idl | ||
| nsIThread.idl | ||
| nsIThreadInternal.idl | ||
| nsIThreadManager.idl | ||
| nsIThreadPool.idl | ||
| nsITimer.idl | ||
| nsMemoryPressure.cpp | ||
| nsMemoryPressure.h | ||
| nsProcess.h | ||
| nsProcessCommon.cpp | ||
| nsProxyRelease.cpp | ||
| nsProxyRelease.h | ||
| nsThread.cpp | ||
| nsThread.h | ||
| nsThreadManager.cpp | ||
| nsThreadManager.h | ||
| nsThreadPool.cpp | ||
| nsThreadPool.h | ||
| nsThreadSyncDispatch.h | ||
| nsThreadUtils.cpp | ||
| nsThreadUtils.h | ||
| nsTimerImpl.cpp | ||
| nsTimerImpl.h | ||
| PerformanceCounter.cpp | ||
| PerformanceCounter.h | ||
| PrioritizedEventQueue.cpp | ||
| PrioritizedEventQueue.h | ||
| Queue.h | ||
| RecursiveMutex.cpp | ||
| RecursiveMutex.h | ||
| ReentrantMonitor.h | ||
| RWLock.cpp | ||
| RWLock.h | ||
| SchedulerGroup.cpp | ||
| SchedulerGroup.h | ||
| SharedThreadPool.cpp | ||
| SharedThreadPool.h | ||
| StateMirroring.h | ||
| StateWatching.h | ||
| SynchronizedEventQueue.cpp | ||
| SynchronizedEventQueue.h | ||
| SyncRunnable.h | ||
| SystemGroup.cpp | ||
| SystemGroup.h | ||
| TaskCategory.h | ||
| TaskDispatcher.h | ||
| TaskQueue.cpp | ||
| TaskQueue.h | ||
| ThreadBound.h | ||
| ThreadDelay.cpp | ||
| ThreadDelay.h | ||
| ThreadEventQueue.cpp | ||
| ThreadEventQueue.h | ||
| ThreadEventTarget.cpp | ||
| ThreadEventTarget.h | ||
| ThreadLocalVariables.cpp | ||
| ThrottledEventQueue.cpp | ||
| ThrottledEventQueue.h | ||
| TimerThread.cpp | ||
| TimerThread.h | ||