From 87703540b03e31d3d34a0645b2e03011471f4167 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 30 Nov 2010 08:06:24 +0000
Subject: [PATCH] * addr2line.c (parse_debug_line_cu): ignore
 DW_LNE_set_discriminator.   To ignore, it needs to read a sigle unsigned
 LEB128 integer.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29983 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog   | 5 +++++
 addr2line.c | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index cdda576cd0..2df7ee73a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Nov 30 17:04:10 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (parse_debug_line_cu): ignore DW_LNE_set_discriminator.
+	  To ignore, it needs to read a sigle unsigned LEB128 integer.
+
 Tue Nov 30 16:29:19 2010  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* vm_dump.c: undef HAVE_BACKTRACE when the OS is FreeBSD (in other
diff --git a/addr2line.c b/addr2line.c
index 443333f256..a562a831e9 100644
--- a/addr2line.c
+++ b/addr2line.c
@@ -346,6 +346,10 @@ parse_debug_line_cu(int num_traces, void **traces,
 		fprintf(stderr, "Unsupported operation in %s\n",
 			binary_filename);
 		break;
+	    case DW_LNE_set_discriminator:
+		/* TODO:currently ignore */
+		uleb128(&p);
+		break;
 	    default:
 		fprintf(stderr, "Unknown extended opcode: %d in %s\n",
 			op, binary_filename);