summaryrefslogtreecommitdiff
path: root/vm_dump.c
diff options
context:
space:
mode:
authorkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-21 17:21:12 +0000
committerkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-21 17:21:12 +0000
commit585afbbc6a833e91cd2e51b8faeece2248c0cc16 (patch)
treea47c36c7d471a24152764e8df451ce482fbabc31 /vm_dump.c
parent4da6fa28f884329e04b3916565b6ba674705345a (diff)
downloadruby-585afbbc6a833e91cd2e51b8faeece2248c0cc16.tar.gz
* vm_dump.c (rb_vm_bugreport): revert r38533.
* addr2line.c (fill_lines): add ELF sanity check. [Bug #7597] [ruby-dev:46786] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38543 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_dump.c')
-rw-r--r--vm_dump.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/vm_dump.c b/vm_dump.c
index 50d3ebfdf5..292280c40f 100644
--- a/vm_dump.c
+++ b/vm_dump.c
@@ -644,15 +644,14 @@ rb_vm_bugreport(void)
char **syms = backtrace_symbols(trace, n);
if (syms) {
-/* commentout temporarily. we have to fix addr2line. see [Bug #7597] */
-/* #ifdef USE_ELF */
-/* rb_dump_backtrace_with_lines(n, trace, syms); */
-/* #else */
+#ifdef USE_ELF
+ rb_dump_backtrace_with_lines(n, trace, syms);
+#else
int i;
for (i=0; i<n; i++) {
fprintf(stderr, "%s\n", syms[i]);
}
-/* #endif */
+#endif
free(syms);
}
#elif defined(_WIN32)