From d162aa8ed4c297355e31bddb6292216ffa5f941e Mon Sep 17 00:00:00 2001
From: Michael Beck <beck@ipd.info.uni-karlsruhe.de>
Date: Tue, 12 Sep 2006 12:16:01 +0000
Subject: [PATCH] default_dbg_info_merge_pair() now leaves debug info in only
 one node has one

[r8219]
---
 ir/debug/dbginfo.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/ir/debug/dbginfo.c b/ir/debug/dbginfo.c
index 20ff762d0..02ea494bc 100644
--- a/ir/debug/dbginfo.c
+++ b/ir/debug/dbginfo.c
@@ -3,10 +3,10 @@
  * File name:   ir/debug/dbginfo.c
  * Purpose:     Implements the Firm interface to debug information.
  * Author:      Goetz Lindenmaier
- * Modified by:
+ * Modified by: Michael Beck
  * Created:     2001
  * CVS-ID:      $Id$
- * Copyright:   (c) 2001-2003 Universität Karlsruhe
+ * Copyright:   (c) 2001-2006 Universität Karlsruhe
  * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
  */
 
@@ -21,7 +21,9 @@
 
 void
 default_dbg_info_merge_pair(ir_node *nw, ir_node *old, dbg_action info) {
-  set_irn_dbg_info(nw, get_irn_dbg_info(old));
+  dbg_info *old_db = get_irn_dbg_info(old);
+  if (old_db)
+    set_irn_dbg_info(nw, old_db);
 }
 
 void
-- 
2.20.1