2015-05-03 22:32:37 +03:00
|
|
|
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
2015-04-07 04:36:55 +03:00
|
|
|
/* 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/. */
|
|
|
|
|
2019-11-12 20:27:20 +03:00
|
|
|
#ifndef IPC_ErrorIPCUtils_h
|
|
|
|
#define IPC_ErrorIPCUtils_h
|
|
|
|
|
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 19:19:48 +03:00
|
|
|
#include <utility>
|
|
|
|
|
2020-12-10 14:09:21 +03:00
|
|
|
#include "ipc/EnumSerializer.h"
|
2015-04-07 04:36:55 +03:00
|
|
|
#include "ipc/IPCMessageUtils.h"
|
|
|
|
#include "mozilla/Assertions.h"
|
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 19:19:48 +03:00
|
|
|
#include "mozilla/ErrorResult.h"
|
2015-04-07 04:36:55 +03:00
|
|
|
|
|
|
|
namespace IPC {
|
|
|
|
|
|
|
|
template <>
|
|
|
|
struct ParamTraits<mozilla::dom::ErrNum>
|
|
|
|
: public ContiguousEnumSerializer<
|
|
|
|
mozilla::dom::ErrNum, mozilla::dom::ErrNum(0),
|
|
|
|
mozilla::dom::ErrNum(mozilla::dom::Err_Limit)> {};
|
|
|
|
|
|
|
|
template <>
|
|
|
|
struct ParamTraits<mozilla::ErrorResult> {
|
|
|
|
typedef mozilla::ErrorResult paramType;
|
|
|
|
|
|
|
|
static void Write(Message* aMsg, const paramType& aParam) {
|
|
|
|
// It should be the case that mMightHaveUnreportedJSException can only be
|
|
|
|
// true when we're expecting a JS exception. We cannot send such messages
|
|
|
|
// over the IPC channel since there is no sane way of transferring the JS
|
|
|
|
// value over to the other side. Callers should never do that.
|
|
|
|
MOZ_ASSERT_IF(aParam.IsJSException(),
|
|
|
|
aParam.mMightHaveUnreportedJSException);
|
|
|
|
if (aParam.IsJSException()
|
2019-11-12 20:27:20 +03:00
|
|
|
#ifdef DEBUG
|
2015-04-07 04:36:55 +03:00
|
|
|
|| aParam.mMightHaveUnreportedJSException
|
2019-11-12 20:27:20 +03:00
|
|
|
#endif
|
2015-04-07 04:36:55 +03:00
|
|
|
) {
|
|
|
|
MOZ_CRASH(
|
|
|
|
"Cannot encode an ErrorResult representing a Javascript exception");
|
|
|
|
}
|
|
|
|
|
|
|
|
WriteParam(aMsg, aParam.mResult);
|
|
|
|
WriteParam(aMsg, aParam.IsErrorWithMessage());
|
2015-10-09 23:48:10 +03:00
|
|
|
WriteParam(aMsg, aParam.IsDOMException());
|
2015-04-07 04:36:55 +03:00
|
|
|
if (aParam.IsErrorWithMessage()) {
|
|
|
|
aParam.SerializeMessage(aMsg);
|
2015-10-09 23:48:10 +03:00
|
|
|
} else if (aParam.IsDOMException()) {
|
|
|
|
aParam.SerializeDOMExceptionInfo(aMsg);
|
2015-04-07 04:36:55 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-02-05 19:15:07 +03:00
|
|
|
static void Write(Message* aMsg, paramType&& aParam) {
|
|
|
|
Write(aMsg, static_cast<const paramType&>(aParam));
|
|
|
|
aParam.SuppressException();
|
|
|
|
}
|
|
|
|
|
2016-04-21 07:09:15 +03:00
|
|
|
static bool Read(const Message* aMsg, PickleIterator* aIter,
|
|
|
|
paramType* aResult) {
|
2015-04-07 04:36:55 +03:00
|
|
|
paramType readValue;
|
|
|
|
if (!ReadParam(aMsg, aIter, &readValue.mResult)) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
bool hasMessage = false;
|
|
|
|
if (!ReadParam(aMsg, aIter, &hasMessage)) {
|
|
|
|
return false;
|
|
|
|
}
|
2015-10-09 23:48:10 +03:00
|
|
|
bool hasDOMExceptionInfo = false;
|
|
|
|
if (!ReadParam(aMsg, aIter, &hasDOMExceptionInfo)) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
if (hasMessage && hasDOMExceptionInfo) {
|
|
|
|
// Shouldn't have both!
|
|
|
|
return false;
|
|
|
|
}
|
2015-04-07 04:36:55 +03:00
|
|
|
if (hasMessage && !readValue.DeserializeMessage(aMsg, aIter)) {
|
|
|
|
return false;
|
2015-10-09 23:48:10 +03:00
|
|
|
} else if (hasDOMExceptionInfo &&
|
|
|
|
!readValue.DeserializeDOMExceptionInfo(aMsg, aIter)) {
|
|
|
|
return false;
|
2015-04-07 04:36:55 +03:00
|
|
|
}
|
2018-05-30 22:15:35 +03:00
|
|
|
*aResult = std::move(readValue);
|
2015-04-07 04:36:55 +03:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2018-04-26 23:50:56 +03:00
|
|
|
template <>
|
|
|
|
struct ParamTraits<mozilla::CopyableErrorResult> {
|
|
|
|
typedef mozilla::CopyableErrorResult paramType;
|
|
|
|
|
|
|
|
static void Write(Message* aMsg, const paramType& aParam) {
|
|
|
|
ParamTraits<mozilla::ErrorResult>::Write(aMsg, aParam);
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool Read(const Message* aMsg, PickleIterator* aIter,
|
|
|
|
paramType* aResult) {
|
2020-02-14 13:19:05 +03:00
|
|
|
// We can't cast *aResult to ErrorResult&, so cheat and just cast
|
|
|
|
// to ErrorResult*.
|
|
|
|
return ParamTraits<mozilla::ErrorResult>::Read(
|
|
|
|
aMsg, aIter, reinterpret_cast<mozilla::ErrorResult*>(aResult));
|
2018-04-26 23:50:56 +03:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2015-07-13 18:25:42 +03:00
|
|
|
} // namespace IPC
|
2015-04-07 04:36:55 +03:00
|
|
|
|
|
|
|
#endif
|