Skip to content

Commit 8d013da

Browse files
WIP
1 parent f6f56ef commit 8d013da

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

src/utils/SignalFunctionWrapper.hpp

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ class ScopedRuntimeGuard final {
5656
~ScopedRuntimeGuard() VB_NOEXCEPT;
5757

5858
ScopedRuntimeGuard(ScopedRuntimeGuard const &) = delete;
59-
ScopedRuntimeGuard &operator=(ScopedRuntimeGuard const &) = delete;
59+
ScopedRuntimeGuard &operator=(ScopedRuntimeGuard const &) & = delete;
6060
ScopedRuntimeGuard(ScopedRuntimeGuard &&) = delete;
61-
ScopedRuntimeGuard &operator=(ScopedRuntimeGuard &&) = delete;
61+
ScopedRuntimeGuard &operator=(ScopedRuntimeGuard &&) & = delete;
6262
};
6363

6464
///
@@ -77,7 +77,7 @@ class SignalFunctionWrapper final {
7777
/// @throws std::runtime_error signal handler setup failed
7878
///
7979
static inline void start(Runtime &runtime) {
80-
ScopedRuntimeGuard const guard(runtime);
80+
ScopedRuntimeGuard const guard{runtime};
8181
SignalFunction::call_raw(start_wrapper, runtime);
8282
}
8383

@@ -103,7 +103,7 @@ class SignalFunctionWrapper final {
103103
template <size_t NumReturnValue, typename... FunctionArguments>
104104
static std::array<WasmValue, NumReturnValue> call(ModuleFunction<NumReturnValue, FunctionArguments...> const &function,
105105
FunctionArguments... args) VB_THROW {
106-
ScopedRuntimeGuard const guard(function.getRuntime());
106+
ScopedRuntimeGuard const guard{function.getRuntime()};
107107
return SignalFunction::call_raw<NumReturnValue>(function, args...);
108108
}
109109

@@ -117,7 +117,7 @@ class SignalFunctionWrapper final {
117117
/// @throws std::runtime_error signal handler setup failed
118118
///
119119
static void call(RawModuleFunction const &function, uint8_t const *const serializedArgs, uint8_t *const results) {
120-
ScopedRuntimeGuard const guard(function.getRuntime());
120+
ScopedRuntimeGuard const guard{function.getRuntime()};
121121
return SignalFunction::call_raw(callRawModuleFunction_wrapper, function, serializedArgs, results);
122122
}
123123

@@ -131,7 +131,7 @@ class SignalFunctionWrapper final {
131131
/// @throws std::runtime_error signal handler setup failed
132132
///
133133
static void call(RawModuleFunction const &function, WasmValue const *const serializedArgs, WasmValue *const results) {
134-
ScopedRuntimeGuard const guard(function.getRuntime());
134+
ScopedRuntimeGuard const guard{function.getRuntime()};
135135
return SignalFunction::call_raw(callRawModuleFunction_wrapper, function, pCast<uint8_t const *const>(serializedArgs),
136136
pCast<uint8_t *const>(results));
137137
}
@@ -210,13 +210,14 @@ class SignalFunctionWrapper final {
210210
};
211211

212212
// ScopedRuntimeGuard implementation (after SignalFunctionWrapper is complete)
213+
// coverity[autosar_cpp14_a3_1_5_violation]
213214
inline ScopedRuntimeGuard::ScopedRuntimeGuard(Runtime const &runtime) VB_NOEXCEPT {
214215
static_cast<void>(runtime);
215216
#if !LINEAR_MEMORY_BOUNDS_CHECKS || !ACTIVE_STACK_OVERFLOW_CHECK
216217
SignalFunctionWrapper::pRuntime_ = &runtime;
217218
#endif
218219
}
219-
220+
// coverity[autosar_cpp14_a3_1_5_violation]
220221
inline ScopedRuntimeGuard::~ScopedRuntimeGuard() VB_NOEXCEPT {
221222
#if !LINEAR_MEMORY_BOUNDS_CHECKS || !ACTIVE_STACK_OVERFLOW_CHECK
222223
SignalFunctionWrapper::pRuntime_ = nullptr;

0 commit comments

Comments
 (0)