mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-24 21:31:04 +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
166 lines
6.0 KiB
C++
166 lines
6.0 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/. */
|
|
|
|
/* Implementation of macros to ensure correct use of RAII Auto* objects. */
|
|
|
|
#ifndef mozilla_GuardObjects_h
|
|
#define mozilla_GuardObjects_h
|
|
|
|
#include "mozilla/Assertions.h"
|
|
#include "mozilla/Types.h"
|
|
|
|
#include <utility>
|
|
|
|
#ifdef __cplusplus
|
|
|
|
# ifdef DEBUG
|
|
|
|
/**
|
|
* A custom define is used rather than |mozPoisonValue()| due to cascading
|
|
* build failures relating to how mfbt is linked on different operating
|
|
* systems. See bug 1160253.
|
|
*/
|
|
# define MOZ_POISON uintptr_t(-1)
|
|
|
|
namespace mozilla {
|
|
namespace detail {
|
|
|
|
/*
|
|
* The following classes are designed to cause assertions to detect
|
|
* inadvertent use of guard objects as temporaries. In other words,
|
|
* when we have a guard object whose only purpose is its constructor and
|
|
* destructor (and is never otherwise referenced), the intended use
|
|
* might be:
|
|
*
|
|
* AutoRestore savePainting(mIsPainting);
|
|
*
|
|
* but is is easy to accidentally write:
|
|
*
|
|
* AutoRestore(mIsPainting);
|
|
*
|
|
* which compiles just fine, but runs the destructor well before the
|
|
* intended time.
|
|
*
|
|
* They work by adding (#ifdef DEBUG) an additional parameter to the
|
|
* guard object's constructor, with a default value, so that users of
|
|
* the guard object's API do not need to do anything. The default value
|
|
* of this parameter is a temporary object. C++ (ISO/IEC 14882:1998),
|
|
* section 12.2 [class.temporary], clauses 4 and 5 seem to assume a
|
|
* guarantee that temporaries are destroyed in the reverse of their
|
|
* construction order, but I actually can't find a statement that that
|
|
* is true in the general case (beyond the two specific cases mentioned
|
|
* there). However, it seems to be true.
|
|
*
|
|
* These classes are intended to be used only via the macros immediately
|
|
* below them:
|
|
*
|
|
* MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER declares (ifdef DEBUG) a member
|
|
* variable, and should be put where a declaration of a private
|
|
* member variable would be placed.
|
|
* MOZ_GUARD_OBJECT_NOTIFIER_PARAM should be placed at the end of the
|
|
* parameters to each constructor of the guard object; it declares
|
|
* (ifdef DEBUG) an additional parameter. (But use the *_ONLY_PARAM
|
|
* variant for constructors that take no other parameters.)
|
|
* MOZ_GUARD_OBJECT_NOTIFIER_PARAM_IN_IMPL should likewise be used in
|
|
* the implementation of such constructors when they are not inline.
|
|
* MOZ_GUARD_OBJECT_NOTIFIER_PARAM_TO_PARENT should be used in
|
|
* the implementation of such constructors to pass the parameter to
|
|
* a base class that also uses these macros
|
|
* MOZ_GUARD_OBJECT_NOTIFIER_INIT is a statement that belongs in each
|
|
* constructor. It uses the parameter declared by
|
|
* MOZ_GUARD_OBJECT_NOTIFIER_PARAM.
|
|
*
|
|
* For more details, and examples of using these macros, see
|
|
* https://developer.mozilla.org/en/Using_RAII_classes_in_Mozilla
|
|
*/
|
|
class GuardObjectNotifier {
|
|
private:
|
|
bool* mStatementDone;
|
|
|
|
public:
|
|
GuardObjectNotifier() : mStatementDone(reinterpret_cast<bool*>(MOZ_POISON)) {}
|
|
|
|
~GuardObjectNotifier() {
|
|
// Assert that the GuardObjectNotifier has been properly initialized by
|
|
// using the |MOZ_GUARD_OBJECT_NOTIFIER_INIT| macro. A poison value is
|
|
// used rather than a null check to appease static analyzers that were
|
|
// (incorrectly) detecting null pointer dereferences.
|
|
MOZ_ASSERT(mStatementDone != reinterpret_cast<bool*>(MOZ_POISON));
|
|
*mStatementDone = true;
|
|
}
|
|
|
|
void setStatementDone(bool* aStatementIsDone) {
|
|
mStatementDone = aStatementIsDone;
|
|
}
|
|
};
|
|
|
|
class GuardObjectNotificationReceiver {
|
|
private:
|
|
bool mStatementDone;
|
|
|
|
public:
|
|
GuardObjectNotificationReceiver() : mStatementDone(false) {}
|
|
|
|
~GuardObjectNotificationReceiver() {
|
|
/*
|
|
* Assert that the guard object was not used as a temporary. (Note that
|
|
* this assert might also fire if init is not called because the guard
|
|
* object's implementation is not using the above macros correctly.)
|
|
*/
|
|
MOZ_ASSERT(mStatementDone,
|
|
"Guard object should not be used as a temporary.");
|
|
}
|
|
|
|
void init(GuardObjectNotifier& aNotifier) {
|
|
aNotifier.setStatementDone(&mStatementDone);
|
|
}
|
|
};
|
|
|
|
} /* namespace detail */
|
|
} /* namespace mozilla */
|
|
|
|
# undef MOZ_POISON
|
|
|
|
# endif /* DEBUG */
|
|
|
|
# ifdef DEBUG
|
|
# define MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER \
|
|
::mozilla::detail::GuardObjectNotificationReceiver \
|
|
_mCheckNotUsedAsTemporary;
|
|
# define MOZ_GUARD_OBJECT_NOTIFIER_PARAM \
|
|
, ::mozilla::detail::GuardObjectNotifier&& _notifier = \
|
|
::mozilla::detail::GuardObjectNotifier()
|
|
# define MOZ_GUARD_OBJECT_NOTIFIER_ONLY_PARAM \
|
|
::mozilla::detail::GuardObjectNotifier&& _notifier = \
|
|
::mozilla::detail::GuardObjectNotifier()
|
|
# define MOZ_GUARD_OBJECT_NOTIFIER_PARAM_IN_IMPL \
|
|
, ::mozilla::detail::GuardObjectNotifier&& _notifier
|
|
# define MOZ_GUARD_OBJECT_NOTIFIER_ONLY_PARAM_IN_IMPL \
|
|
::mozilla::detail::GuardObjectNotifier&& _notifier
|
|
# define MOZ_GUARD_OBJECT_NOTIFIER_PARAM_TO_PARENT , ::std::move(_notifier)
|
|
# define MOZ_GUARD_OBJECT_NOTIFIER_ONLY_PARAM_TO_PARENT \
|
|
::std::move(_notifier)
|
|
# define MOZ_GUARD_OBJECT_NOTIFIER_INIT \
|
|
do { \
|
|
_mCheckNotUsedAsTemporary.init(_notifier); \
|
|
} while (0)
|
|
# else
|
|
# define MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER
|
|
# define MOZ_GUARD_OBJECT_NOTIFIER_PARAM
|
|
# define MOZ_GUARD_OBJECT_NOTIFIER_ONLY_PARAM
|
|
# define MOZ_GUARD_OBJECT_NOTIFIER_PARAM_IN_IMPL
|
|
# define MOZ_GUARD_OBJECT_NOTIFIER_ONLY_PARAM_IN_IMPL
|
|
# define MOZ_GUARD_OBJECT_NOTIFIER_ONLY_PARAM_TO_PARENT
|
|
# define MOZ_GUARD_OBJECT_NOTIFIER_PARAM_TO_PARENT
|
|
# define MOZ_GUARD_OBJECT_NOTIFIER_INIT \
|
|
do { \
|
|
} while (0)
|
|
# endif
|
|
|
|
#endif /* __cplusplus */
|
|
|
|
#endif /* mozilla_GuardObjects_h */
|