summaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
authorNick Lewycky <nicholas@mxc.ca>2013-02-27 06:22:56 +0000
committerNick Lewycky <nicholas@mxc.ca>2013-02-27 06:22:56 +0000
commit52b4edf6a1b5d3a9f8a94a63c702d55ed446ecdb (patch)
tree99127260c735702a1a751e7217cbe74cd180d794 /runtime
parent58591b1647e0f1f213e5acd7bfa87c226ced0033 (diff)
downloadllvm-52b4edf6a1b5d3a9f8a94a63c702d55ed446ecdb.tar.gz
llvm-52b4edf6a1b5d3a9f8a94a63c702d55ed446ecdb.tar.bz2
llvm-52b4edf6a1b5d3a9f8a94a63c702d55ed446ecdb.tar.xz
In GCC 4.7, function names are now forbidden from .gcda files. Support this by
passing a null pointer to the function name in to GCDAProfiling, and add another switch onto GCOVProfiling. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@176173 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'runtime')
-rw-r--r--runtime/libprofile/GCDAProfiling.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/runtime/libprofile/GCDAProfiling.c b/runtime/libprofile/GCDAProfiling.c
index f2dc4f7988..d9f3b32638 100644
--- a/runtime/libprofile/GCDAProfiling.c
+++ b/runtime/libprofile/GCDAProfiling.c
@@ -162,17 +162,22 @@ void llvm_gcda_increment_indirect_counter(uint32_t *predecessor,
void llvm_gcda_emit_function(uint32_t ident, const char *function_name) {
#ifdef DEBUG_GCDAPROFILING
- printf("llvmgcda: function id=%x\n", ident);
+ printf("llvmgcda: function id=%x name=%s\n", ident,
+ function_name ? function_name : "NULL");
#endif
if (!output_file) return;
/* function tag */
fwrite("\0\0\0\1", 4, 1, output_file);
- write_int32(3 + 1 + length_of_string(function_name));
+ uint32_t len = 3;
+ if (function_name)
+ len += 1 + length_of_string(function_name);
+ write_int32(len);
write_int32(ident);
write_int32(0);
write_int32(0);
- write_string(function_name);
+ if (function_name)
+ write_string(function_name);
}
void llvm_gcda_emit_arcs(uint32_t num_counters, uint64_t *counters) {