diff options
| author |  brian-peloton <brian@peloton-tech.com> | 2017-05-23 16:22:57 -0700 |
|---|---|---|
| committer |  Feng Xiao <xfxyjwf@gmail.com> | 2017-05-23 16:22:57 -0700 |
| commit | 40da1ed572d60e9c7cc2fe1ca4175e30682f5a9d (patch) | |
| tree | 78c05eefc2a870be1ed053fe77d7f349f4cf1413 /src/google/protobuf/stubs/port.h | |
| parent | ba987a7e2d039107d304aa945fee662399461d58 (diff) | |
Removing undefined behavior and compiler warnings (#1315)
* Comment out unused arguments.
These last few are all that's needed to compile with -Wunused-arguments.
* Fix missing struct field initializer.
With this fix, everything compiles with -Wmissing-field-initializers.
* Add support for disabling unaligned memory accesses on x86 too.
ubsan doesn't like these because they are technically undefined
behavior, so -DGOOGLE_PROTOBUF_DONT_USE_UNALIGNED will disable them easily.
* Avoid undefined integer overflow.
ubsan catches all of these.
Diffstat (limited to 'src/google/protobuf/stubs/port.h')
| -rw-r--r-- | src/google/protobuf/stubs/port.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/google/protobuf/stubs/port.h b/src/google/protobuf/stubs/port.h index 6ec5e001..0afd55d7 100644 --- a/src/google/protobuf/stubs/port.h +++ b/src/google/protobuf/stubs/port.h @@ -252,9 +252,15 @@ static const uint64 kuint64max = GOOGLE_ULONGLONG(0xFFFFFFFFFFFFFFFF); #define GOOGLE_GUARDED_BY(x) #define GOOGLE_ATTRIBUTE_COLD +#ifdef GOOGLE_PROTOBUF_DONT_USE_UNALIGNED +# define GOOGLE_PROTOBUF_USE_UNALIGNED 0 +#else // x86 and x86-64 can perform unaligned loads/stores directly. -#if defined(_M_X64) || defined(__x86_64__) || \ - defined(_M_IX86) || defined(__i386__) +# define GOOGLE_PROTOBUF_USE_UNALIGNED defined(_M_X64) || \ + defined(__x86_64__) || defined(_M_IX86) || defined(__i386__) +#endif + +#if GOOGLE_PROTOBUF_USE_UNALIGNED #define GOOGLE_UNALIGNED_LOAD16(_p) (*reinterpret_cast<const uint16 *>(_p)) #define GOOGLE_UNALIGNED_LOAD32(_p) (*reinterpret_cast<const uint32 *>(_p)) |