commit ba63fa731ec46f776a9bbfd06b94c4c31e8e0e90
author Chris Kennelly <ckennelly@google.com> Thu Dec 15 13:25:26 2016 -0800
committer Chris Kennelly <ckennelly@google.com> Thu Dec 15 14:43:33 2016 -0800
tree 21cc9f8762b3a6422fa4925204a459a817823a3d
parent a95e38ce8dec20d327692f4f5c2b0d37d6776696

Remove spurious NULL checks in ArenaStringPtr::CreateInstance.

src/google/protobuf/arenastring.h

diff --git a/src/google/protobuf/arenastring.h b/src/google/protobuf/arenastring.h
index b60ee37..726c19d 100755
--- a/src/google/protobuf/arenastring.h
+++ b/src/google/protobuf/arenastring.h
@@ -283,22 +283,15 @@
 
   GOOGLE_ATTRIBUTE_NOINLINE void CreateInstance(::google::protobuf::Arena* arena,
                                          const ::std::string* initial_value) {
-    // Assumes ptr_ is not NULL.
-    if (initial_value != NULL) {
-      ptr_ = new ::std::string(*initial_value);
-    } else {
-      ptr_ = new ::std::string();
-    }
+    GOOGLE_DCHECK(initial_value != NULL);
+    ptr_ = new ::std::string(*initial_value);
     if (arena != NULL) {
       arena->Own(ptr_);
     }
   }
   GOOGLE_ATTRIBUTE_NOINLINE void CreateInstanceNoArena(const ::std::string* initial_value) {
-    if (initial_value != NULL) {
-      ptr_ = new ::std::string(*initial_value);
-    } else {
-      ptr_ = new ::std::string();
-    }
+    GOOGLE_DCHECK(initial_value != NULL);
+    ptr_ = new ::std::string(*initial_value);
   }
 };