gecko-dev/mozglue/misc/DynamicallyLinkedFunctionPtr.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

138 lines
4.1 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/. */
#ifndef mozilla_DynamicallyLinkedFunctionPtr_h
#define mozilla_DynamicallyLinkedFunctionPtr_h
#include <windows.h>
#include <utility>
#include "mozilla/Attributes.h"
namespace mozilla {
namespace detail {
template <typename T>
struct FunctionPtrCracker;
template <typename R, typename... Args>
struct FunctionPtrCracker<R (*)(Args...)> {
using ReturnT = R;
using FunctionPtrT = R (*)(Args...);
};
#if defined(_M_IX86)
template <typename R, typename... Args>
struct FunctionPtrCracker<R(__stdcall*)(Args...)> {
using ReturnT = R;
using FunctionPtrT = R(__stdcall*)(Args...);
};
template <typename R, typename... Args>
struct FunctionPtrCracker<R(__fastcall*)(Args...)> {
using ReturnT = R;
using FunctionPtrT = R(__fastcall*)(Args...);
};
#endif // defined(_M_IX86)
template <typename T>
class DynamicallyLinkedFunctionPtrBase {
public:
using ReturnT = typename FunctionPtrCracker<T>::ReturnT;
using FunctionPtrT = typename FunctionPtrCracker<T>::FunctionPtrT;
DynamicallyLinkedFunctionPtrBase(const wchar_t* aLibName,
const char* aFuncName)
: mModule(::LoadLibraryW(aLibName)), mFunction(nullptr) {
if (!mModule) {
return;
}
mFunction =
reinterpret_cast<FunctionPtrT>(::GetProcAddress(mModule, aFuncName));
if (!mFunction) {
// Since the function doesn't exist, there is no point in holding a
// reference to mModule anymore.
::FreeLibrary(mModule);
mModule = nullptr;
}
}
DynamicallyLinkedFunctionPtrBase(const DynamicallyLinkedFunctionPtrBase&) =
delete;
DynamicallyLinkedFunctionPtrBase& operator=(
const DynamicallyLinkedFunctionPtrBase&) = delete;
DynamicallyLinkedFunctionPtrBase(DynamicallyLinkedFunctionPtrBase&&) = delete;
DynamicallyLinkedFunctionPtrBase& operator=(
DynamicallyLinkedFunctionPtrBase&&) = delete;
template <typename... Args>
ReturnT operator()(Args&&... args) const {
return mFunction(std::forward<Args>(args)...);
}
explicit operator bool() const { return !!mFunction; }
protected:
HMODULE mModule;
FunctionPtrT mFunction;
};
} // namespace detail
/**
* In most cases, this class is the one that you want to use for resolving a
* dynamically-linked function pointer. It should be instantiated as a static
* local variable.
*
* NB: It has a trivial destructor, so the DLL that is loaded is never freed.
* Assuming that this function is called fairly often, this is the most
* sensible option. OTOH, if the function you are calling is a one-off, or the
* static local requirement is too restrictive, use DynamicallyLinkedFunctionPtr
* instead.
*/
template <typename T>
class MOZ_STATIC_LOCAL_CLASS StaticDynamicallyLinkedFunctionPtr final
: public detail::DynamicallyLinkedFunctionPtrBase<T> {
public:
StaticDynamicallyLinkedFunctionPtr(const wchar_t* aLibName,
const char* aFuncName)
: detail::DynamicallyLinkedFunctionPtrBase<T>(aLibName, aFuncName) {}
/**
* We only offer this operator for the static local case, as it is not
* possible for this object to be destroyed while the returned pointer is
* being held.
*/
operator typename detail::DynamicallyLinkedFunctionPtrBase<T>::FunctionPtrT()
const {
return this->mFunction;
}
};
template <typename T>
class MOZ_NON_PARAM MOZ_NON_TEMPORARY_CLASS DynamicallyLinkedFunctionPtr final
: public detail::DynamicallyLinkedFunctionPtrBase<T> {
public:
DynamicallyLinkedFunctionPtr(const wchar_t* aLibName, const char* aFuncName)
: detail::DynamicallyLinkedFunctionPtrBase<T>(aLibName, aFuncName) {}
~DynamicallyLinkedFunctionPtr() {
if (!this->mModule) {
return;
}
::FreeLibrary(this->mModule);
}
};
} // namespace mozilla
#endif // mozilla_DynamicallyLinkedFunctionPtr_h