-
- Downloads
Bug 1609996 - Reorder some includes affected by the previous patches. r=froydnj
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
Showing
- accessible/base/TextRange.h 1 addition, 0 deletionsaccessible/base/TextRange.h
- accessible/ipc/win/COMPtrTypes.cpp 6 additions, 5 deletionsaccessible/ipc/win/COMPtrTypes.cpp
- accessible/ipc/win/HandlerProvider.cpp 6 additions, 5 deletionsaccessible/ipc/win/HandlerProvider.cpp
- accessible/ipc/win/handler/AccessibleHandlerControl.cpp 2 additions, 3 deletionsaccessible/ipc/win/handler/AccessibleHandlerControl.cpp
- accessible/xpcom/xpcAccessibleTextRange.h 3 additions, 3 deletionsaccessible/xpcom/xpcAccessibleTextRange.h
- browser/app/winlauncher/ErrorHandler.cpp 5 additions, 4 deletionsbrowser/app/winlauncher/ErrorHandler.cpp
- browser/app/winlauncher/ProcThreadAttributes.h 4 additions, 3 deletionsbrowser/app/winlauncher/ProcThreadAttributes.h
- browser/app/winlauncher/test/TestSameBinary.cpp 5 additions, 5 deletionsbrowser/app/winlauncher/test/TestSameBinary.cpp
- chrome/nsChromeRegistryChrome.h 3 additions, 2 deletionschrome/nsChromeRegistryChrome.h
- devtools/shared/heapsnapshot/DeserializedNode.h 3 additions, 2 deletionsdevtools/shared/heapsnapshot/DeserializedNode.h
- devtools/shared/heapsnapshot/tests/gtest/DevTools.h 9 additions, 9 deletionsdevtools/shared/heapsnapshot/tests/gtest/DevTools.h
- docshell/base/nsDocShell.h 18 additions, 22 deletionsdocshell/base/nsDocShell.h
- docshell/base/timeline/ObservedDocShell.cpp 2 additions, 1 deletiondocshell/base/timeline/ObservedDocShell.cpp
- dom/animation/KeyframeUtils.cpp 10 additions, 9 deletionsdom/animation/KeyframeUtils.cpp
- dom/base/IdentifierMapEntry.h 3 additions, 4 deletionsdom/base/IdentifierMapEntry.h
- dom/base/StructuredCloneHolder.h 3 additions, 2 deletionsdom/base/StructuredCloneHolder.h
- dom/base/nsDOMMutationObserver.h 15 additions, 14 deletionsdom/base/nsDOMMutationObserver.h
- dom/base/nsQueryContentEventResult.cpp 4 additions, 2 deletionsdom/base/nsQueryContentEventResult.cpp
- dom/bindings/ErrorIPCUtils.h 3 additions, 2 deletionsdom/bindings/ErrorIPCUtils.h
- dom/bindings/ErrorResult.h 6 additions, 5 deletionsdom/bindings/ErrorResult.h
Loading
Please register or sign in to comment