From fa11dea05bd6d5c9d0e4650cb878690ccb1cbe62 Mon Sep 17 00:00:00 2001
From: Feng Xiao <xfxyjwf@gmail.com>
Date: Fri, 10 Aug 2018 16:36:49 -0700
Subject: Fix issues discovered in up-integration.

---
 src/google/protobuf/message.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/google/protobuf/message.h b/src/google/protobuf/message.h
index 023660c0..007dafa2 100644
--- a/src/google/protobuf/message.h
+++ b/src/google/protobuf/message.h
@@ -1160,7 +1160,7 @@ const T* DynamicCastToGenerated(const Message* from) {
   (void)unused;
 
 #ifdef GOOGLE_PROTOBUF_NO_RTTI
-  bool ok = &T::default_instance()->GetReflection() == from->GetReflection();
+  bool ok = T::default_instance().GetReflection() == from->GetReflection();
   return ok ? down_cast<const T*>(from) : nullptr;
 #else
   return dynamic_cast<const T*>(from);
-- 
cgit v1.2.3