diff options
| author | bunnei <bunneidev@gmail.com> | 2022-07-16 07:16:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-16 07:16:52 +0200 |
| commit | 93a4ca11fa976a71cfd4912900b5f98993c930d4 (patch) | |
| tree | 4faff3821fd0905e05de813b7f70cdf6b550f3ff | |
| parent | Merge pull request #8587 from merryhime/padding-unused (diff) | |
| parent | common: fix bitfield aliasing on GCC/Clang (diff) | |
| download | yuzu-93a4ca11fa976a71cfd4912900b5f98993c930d4.tar yuzu-93a4ca11fa976a71cfd4912900b5f98993c930d4.tar.gz yuzu-93a4ca11fa976a71cfd4912900b5f98993c930d4.tar.bz2 yuzu-93a4ca11fa976a71cfd4912900b5f98993c930d4.tar.lz yuzu-93a4ca11fa976a71cfd4912900b5f98993c930d4.tar.xz yuzu-93a4ca11fa976a71cfd4912900b5f98993c930d4.tar.zst yuzu-93a4ca11fa976a71cfd4912900b5f98993c930d4.zip | |
| -rw-r--r-- | src/common/bit_field.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/common/bit_field.h b/src/common/bit_field.h index 16d805694..7e1df62b1 100644 --- a/src/common/bit_field.h +++ b/src/common/bit_field.h @@ -146,7 +146,16 @@ public: } constexpr void Assign(const T& value) { +#ifdef _MSC_VER storage = static_cast<StorageType>((storage & ~mask) | FormatValue(value)); +#else + // Explicitly reload with memcpy to avoid compiler aliasing quirks + // regarding optimization: GCC/Clang clobber chained stores to + // different bitfields in the same struct with the last value. + StorageTypeWithEndian storage_; + std::memcpy(&storage_, &storage, sizeof(storage_)); + storage = static_cast<StorageType>((storage_ & ~mask) | FormatValue(value)); +#endif } [[nodiscard]] constexpr T Value() const { |