The computation of string length is not that complicated. Fix it, again. :)

llvm-svn: 130967

lib/Transforms/Instrumentation/GCOVProfiling.cpp

@@ -140,7 +140,7 @@ namespace {
       // A GCOV string is a length, followed by a NUL, then between 0 and 3 NULs
       // padding out to the next 4-byte word. The length is measured in 4-byte
       // words including padding, not bytes of actual string.
-      return (s.size() + 5) / 4;
+      return (s.size() / 4) + 1;
     }
 
     void writeGCOVString(StringRef s) {

runtime/libprofile/GCDAProfiling.c

@@ -49,7 +49,7 @@ static void write_int64(uint64_t i) {
 }
 
 static uint32_t length_of_string(const char *s) {
-  return (strlen(s) + 5) / 4;
+  return (strlen(s) / 4) + 1;
 }
 
 static void write_string(const char *s) {