diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2856bc1683d..e2750ace4e5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2003-04-14  Jason Merrill  <jason@redhat.com>
+
+	PR middle-end/10336, c++/10401
+	* jump.c (never_reached_warning): Also stop looking if we reach the 
+	beginning of the function.
+
 2003-04-15  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	PR target/10338
diff --git a/gcc/jump.c b/gcc/jump.c
index b48bc6b0347..5563ee34581 100644
--- a/gcc/jump.c
+++ b/gcc/jump.c
@@ -1913,7 +1913,8 @@ never_reached_warning (avoided_insn, finish)
      us the head of a block, a NOTE_INSN_BASIC_BLOCK, which often follows
      the line note.  */
   for (insn = PREV_INSN (avoided_insn); ; insn = PREV_INSN (insn))
-    if (GET_CODE (insn) != NOTE)
+    if (GET_CODE (insn) != NOTE
+	|| NOTE_LINE_NUMBER (insn) == NOTE_INSN_FUNCTION_BEG)
       {
 	insn = NEXT_INSN (insn);
 	break;
diff --git a/gcc/testsuite/gcc.dg/Wunreachable-4.c b/gcc/testsuite/gcc.dg/Wunreachable-4.c
new file mode 100644
index 00000000000..38ae6f808c9
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/Wunreachable-4.c
@@ -0,0 +1,12 @@
+/* PR middle-end/10336 */
+/* { dg-options "-Wunreachable-code" } */
+
+void foo(int i)
+{
+  switch(i) {
+    case 0:
+      break;
+    case 1:
+      break;
+  }
+}