TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Advise gcc to inline morph_data::operator new

Browse source 
This is only used in the file where it is defined, so it can be inlined
even though the definition is not in a header.  Enabling inlining
encourages gcc to see that the `operator new`/`operator delete` calls
are not mismatched.
This commit is contained in:
Kp 2022-08-22 01:24:49 +00:00
parent c64a584bfd
commit 44cf8b83be
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
common/main/morph.h
View file

@ -37,6 +37,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#include "object.h"
#include <array>
#include <memory>
#include <new>
#include <span>
namespace dcx {
@ -93,7 +94,15 @@ struct morph_data : prohibit_void_ptr<morph_data>
std::span<vms_vector> get_morph_vecs();
std::span<vms_vector> get_morph_deltas();
private:
static void *operator new(std::size_t bytes, max_vectors);
/* Advise gcc to inline this `operator new` because if it is not inline,
* then -Wmismatched-new-delete issues a spurious warning when it inlines
* the body of `operator delete(void *, max_vectors)` and does not inline
* this method. Possibly relevant gcc bug reports:
*
* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100485 `False positive in -Wmismatched-new-delete`
* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=103993 `-Wismatched-new-delete due to difference in inlining decisions`
*/
static inline void *operator new(std::size_t bytes, max_vectors);
explicit morph_data(object_base &o, max_vectors);
};