Merge commit '8d925a1c7260' from llvm.org/main into next

Author: git apple-llvm automerger

compiler-rt/test/profile/Linux/binary-id-path.c

@@ -25,6 +25,8 @@
 // BINARY-ID-NEXT: Total functions: 3
 // BINARY-ID-NEXT: Maximum function count: 2
 // BINARY-ID-NEXT: Maximum internal block count: 0
+// BINARY-ID-NEXT: Total number of blocks: 3
+// BINARY-ID-NEXT: Total count: 2
 // BINARY-ID-NEXT: Binary IDs:
 // BINARY-ID-NEXT: {{[0-9a-f]+}}
 // BINARY-ID-NEXT: {{[0-9a-f]+}}