Merge pull request #813 from 0xAAE/master

Add GOOGLE_ATTRIBUTE_NOINLINE to GetArena() and GetMaybeArenaPointer(…
9 years ago · c9418912cb
parent fbabf987e6 d41a3d630c
commit c9418912cb
1 changed files with 8 additions and 0 deletions
--- a/src/google/protobuf/message.cc
+++ b/src/google/protobuf/message.cc
@ -495,11 +495,19 @@ Message* GenericTypeHandler<Message>::NewFromPrototype(
  return prototype->New(arena);
 }
 template<>
+#if defined(_MSC_VER) && (_MSC_VER >= 1900)
+// Note: force noinline to workaround MSVC 2015 compiler bug, issue #240
+GOOGLE_ATTRIBUTE_NOINLINE
+#endif
 google::protobuf::Arena* GenericTypeHandler<Message>::GetArena(
    Message* value) {
  return value->GetArena();
 }
 template<>
+#if defined(_MSC_VER) && (_MSC_VER >= 1900)
+// Note: force noinline to workaround MSVC 2015 compiler bug, issue #240
+GOOGLE_ATTRIBUTE_NOINLINE
+#endif
 void* GenericTypeHandler<Message>::GetMaybeArenaPointer(
    Message* value) {
  return value->GetMaybeArenaPointer();