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

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@130967 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Transforms/Instrumentation/GCOVProfiling.cpp b/lib/Transforms/Instrumentation/GCOVProfiling.cpp
index 23427f77e9b3c123f8b01d7ae66f33c8eed8655e..13eecb7f6c330130cea25af9f001e6c36f390a04 100644 (file)
--- a/lib/Transforms/Instrumentation/GCOVProfiling.cpp
+++ b/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) {

diff --git a/runtime/libprofile/GCDAProfiling.c b/runtime/libprofile/GCDAProfiling.c
index 8ab42276003252aa2ceebda126d982f6e3d6e9e1..5af94becfe2bad35a6f9c11b93abe78bc46653e1 100644 (file)
--- a/runtime/libprofile/GCDAProfiling.c
+++ b/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) {