From 5a2a5407e8457b1355f54b0ee0c315b01dbc790b Mon Sep 17 00:00:00 2001
From: Dirk Herrmann <dirk@dirk-herrmanns-seiten.de>
Date: Tue, 19 Sep 2000 10:56:57 +0000
Subject: [PATCH] * Added a comment suggesting to rename scm_handle_by_message.
 * When compiling on gcc, always avoid the GCSE bug. * Removed some redundant
 tests.

---
 libguile/ChangeLog |  7 +++++++
 libguile/throw.c   | 18 ++++++++----------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index d55594afe..d10db6e76 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,10 @@
+2000-09-19  Dirk Herrmann  <D.Herrmann@tu-bs.de>
+
+	* throw.c (scm_handle_by_message):  Added a FIXME comment.
+
+	(scm_ithrow):  Removed some redundant tests.  When compiling on
+	gcc, always add the GCSE bug workaround.
+
 2000-09-14  Gary Houston  <ghouston@arglist.com>
 
 	* print.c (scm_iprin1): write the ascii delete character as #\del
diff --git a/libguile/throw.c b/libguile/throw.c
index 421d3dd73..afa9ffaec 100644
--- a/libguile/throw.c
+++ b/libguile/throw.c
@@ -472,6 +472,10 @@ handler_message (void *handler_data, SCM tag, SCM args)
    message header to print; if zero, we use "guile" instead.  That
    text is followed by a colon, then the message described by ARGS.  */
 
+/* Dirk:FIXME:: The name of the function should make clear that the
+ * application gets terminated.
+ */
+
 SCM
 scm_handle_by_message (void *handler_data, SCM tag, SCM args)
 {
@@ -605,11 +609,8 @@ scm_ithrow (SCM key, SCM args, int noreturn)
 
   /* Search the wind list for an appropriate catch.
      "Waiter, please bring us the wind list." */
-  for (winds = scm_dynwinds; SCM_NIMP (winds); winds = SCM_CDR (winds))
+  for (winds = scm_dynwinds; SCM_CONSP (winds); winds = SCM_CDR (winds))
     {
-      if (! SCM_CONSP (winds))
-	abort ();
-
       dynpair = SCM_CAR (winds);
       if (SCM_CONSP (dynpair))
 	{
@@ -620,28 +621,25 @@ scm_ithrow (SCM key, SCM args, int noreturn)
 	}
     }
 
-#ifdef BROKEN_GCSE
 #ifdef __GNUC__
+  /* Dirk:FIXME:: This bugfix should be removed some time. */
   /* GCC 2.95.2 has a bug in its optimizer that makes it generate
      incorrect code sometimes.  This barrier stops it from being too
      clever. */
   asm volatile ("" : "=g" (winds));
-#else
-#error "GCSE bug found: reconfigure without optimization?"
-#endif
 #endif
 
   /* If we didn't find anything, print a message and abort the process
      right here.  If you don't want this, establish a catch-all around
      any code that might throw up. */
-  if (SCM_NULLP (winds) || SCM_FALSEP (dynpair))
+  if (SCM_NULLP (winds))
     {
       scm_handle_by_message (NULL, key, args);
       abort ();
     }
 
   /* If the wind list is malformed, bail.  */
-  if (SCM_IMP (winds) || SCM_NCONSP (winds))
+  if (!SCM_CONSP (winds))
     abort ();
       
   jmpbuf = SCM_CDR (dynpair);