Merge pull request #2505 from ckennelly/master

Remove spurious NULL checks in ArenaStringPtr::CreateInstance.

Merge pull request #2505 from ckennelly/master
Remove spurious NULL checks in ArenaStringPtr::CreateInstance.
bb2c6b21 · Adam Cozzette · GitHub · fb15862b · ba63fa73 · bb2c6b21
Commit bb2c6b21 authored Dec 20, 2016 by Adam Cozzette Committed by GitHub Dec 20, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 11 deletions

arenastring.h src/google/protobuf/arenastring.h +4 -11

No files found.
--- a/src/google/protobuf/arenastring.h
+++ b/src/google/protobuf/arenastring.h
@@ -283,22 +283,15 @@ struct LIBPROTOBUF_EXPORT ArenaStringPtr {

  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);
  }
 };