gecko-dev/mfbt/ScopeExit.h
Emilio Cobos Álvarez 256c124f94 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
2020-01-20 16:19:48 +00:00

132 lines
3.4 KiB
C++

/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* RAII class for executing arbitrary actions at scope end. */
#ifndef mozilla_ScopeExit_h
#define mozilla_ScopeExit_h
/*
* See http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2014/n4189.pdf for a
* standards-track version of this.
*
* Error handling can be complex when various actions need to be performed that
* need to be undone if an error occurs midway. This can be handled with a
* collection of boolean state variables and gotos, which can get clunky and
* error-prone:
*
* {
* if (!a.setup())
* goto fail;
* isASetup = true;
*
* if (!b.setup())
* goto fail;
* isBSetup = true;
*
* ...
* return true;
*
* fail:
* if (isASetup)
* a.teardown();
* if (isBSetup)
* b.teardown();
* return false;
* }
*
* ScopeExit is a mechanism to simplify this pattern by keeping an RAII guard
* class that will perform the teardown on destruction, unless released. So the
* above would become:
*
* {
* if (!a.setup()) {
* return false;
* }
* auto guardA = MakeScopeExit([&] {
* a.teardown();
* });
*
* if (!b.setup()) {
* return false;
* }
* auto guardB = MakeScopeExit([&] {
* b.teardown();
* });
*
* ...
* guardA.release();
* guardB.release();
* return true;
* }
*
* This header provides:
*
* - |ScopeExit| - a container for a cleanup call, automically called at the
* end of the scope;
* - |MakeScopeExit| - a convenience function for constructing a |ScopeExit|
* with a given cleanup routine, commonly used with a lambda function.
*
* Note that the RAII classes defined in this header do _not_ perform any form
* of reference-counting or garbage-collection. These classes have exactly two
* behaviors:
*
* - if |release()| has not been called, the cleanup is always performed at
* the end of the scope;
* - if |release()| has been called, nothing will happen at the end of the
* scope.
*/
#include <utility>
#include "mozilla/Attributes.h"
#include "mozilla/GuardObjects.h"
namespace mozilla {
template <typename ExitFunction>
class MOZ_STACK_CLASS ScopeExit {
ExitFunction mExitFunction;
bool mExecuteOnDestruction;
MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER
public:
explicit ScopeExit(ExitFunction&& cleanup MOZ_GUARD_OBJECT_NOTIFIER_PARAM)
: mExitFunction(cleanup), mExecuteOnDestruction(true) {
MOZ_GUARD_OBJECT_NOTIFIER_INIT;
}
ScopeExit(ScopeExit&& rhs MOZ_GUARD_OBJECT_NOTIFIER_PARAM)
: mExitFunction(std::move(rhs.mExitFunction)),
mExecuteOnDestruction(rhs.mExecuteOnDestruction) {
MOZ_GUARD_OBJECT_NOTIFIER_INIT;
rhs.release();
}
~ScopeExit() {
if (mExecuteOnDestruction) {
mExitFunction();
}
}
void release() { mExecuteOnDestruction = false; }
private:
explicit ScopeExit(const ScopeExit&) = delete;
ScopeExit& operator=(const ScopeExit&) = delete;
ScopeExit& operator=(ScopeExit&&) = delete;
};
template <typename ExitFunction>
MOZ_MUST_USE ScopeExit<ExitFunction> MakeScopeExit(
ExitFunction&& exitFunction) {
return ScopeExit<ExitFunction>(std::move(exitFunction));
}
} /* namespace mozilla */
#endif /* mozilla_ScopeExit_h */