зеркало из https://github.com/mozilla/gecko-dev.git
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
|
||
|---|---|---|
| .. | ||
| experimental | ||
| AllocPolicy.h | ||
| AllocationRecording.h | ||
| Array.h | ||
| ArrayBuffer.h | ||
| BinASTFormat.h | ||
| BuildId.h | ||
| CallArgs.h | ||
| CallNonGenericMethod.h | ||
| CharacterEncoding.h | ||
| Class.h | ||
| CompilationAndEvaluation.h | ||
| CompileOptions.h | ||
| ContextOptions.h | ||
| Conversions.h | ||
| Date.h | ||
| Debug.h | ||
| Equality.h | ||
| ErrorReport.h | ||
| ForOfIterator.h | ||
| GCAPI.h | ||
| GCAnnotations.h | ||
| GCHashTable.h | ||
| GCPolicyAPI.h | ||
| GCTypeMacros.h | ||
| GCVariant.h | ||
| GCVector.h | ||
| HashTable.h | ||
| HeapAPI.h | ||
| Id.h | ||
| Initialization.h | ||
| JSON.h | ||
| LocaleSensitive.h | ||
| MemoryFunctions.h | ||
| MemoryMetrics.h | ||
| Modules.h | ||
| OffThreadScriptCompilation.h | ||
| Principals.h | ||
| Printf.h | ||
| ProfilingCategory.h | ||
| ProfilingFrameIterator.h | ||
| ProfilingStack.h | ||
| Promise.h | ||
| PropertyDescriptor.h | ||
| PropertySpec.h | ||
| ProtoKey.h | ||
| Proxy.h | ||
| Realm.h | ||
| RealmOptions.h | ||
| RefCounted.h | ||
| RegExp.h | ||
| RegExpFlags.h | ||
| RequiredDefines.h | ||
| Result.h | ||
| RootingAPI.h | ||
| SavedFrameAPI.h | ||
| SharedArrayBuffer.h | ||
| SliceBudget.h | ||
| SourceText.h | ||
| StableStringChars.h | ||
| Stream.h | ||
| StructuredClone.h | ||
| SweepingAPI.h | ||
| Symbol.h | ||
| TraceKind.h | ||
| TraceLoggerAPI.h | ||
| TracingAPI.h | ||
| TrackedOptimizationInfo.h | ||
| Transcoding.h | ||
| TypeDecls.h | ||
| UbiNode.h | ||
| UbiNodeBreadthFirst.h | ||
| UbiNodeCensus.h | ||
| UbiNodeDominatorTree.h | ||
| UbiNodePostOrder.h | ||
| UbiNodeShortestPaths.h | ||
| UbiNodeUtils.h | ||
| UniquePtr.h | ||
| Utility.h | ||
| Value.h | ||
| ValueArray.h | ||
| Vector.h | ||
| Warnings.h | ||
| WeakMapPtr.h | ||
| Wrapper.h | ||