diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2439eddb630..2987491aed5 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-17  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/9639
+	* parser.c (cp_parser_declarator_id): Clear parser->scope.
+
 2003-03-16  Jason Merrill  <jason@redhat.com>
 
 	PR c++/9993
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index f80c260f426..9c157c29a0a 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -10424,7 +10424,10 @@ cp_parser_declarator_id (cp_parser* parser)
   /* If the name was qualified, create a SCOPE_REF to represent 
      that.  */
   if (parser->scope)
-    id_expression = build_nt (SCOPE_REF, parser->scope, id_expression);
+    {
+      id_expression = build_nt (SCOPE_REF, parser->scope, id_expression);
+      parser->scope = NULL_TREE;
+    }
 
   return id_expression;
 }
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 34d6e009561..bb24a38882f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-17  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/9639
+	* g++.dg/parse/crash1.C: New test. 
+
 2003-03-16  Mark Mitchell  <mark@codesourcery.com>
 
 	PR c++/8805
diff --git a/gcc/testsuite/g++.dg/parse/crash1.C b/gcc/testsuite/g++.dg/parse/crash1.C
new file mode 100644
index 00000000000..750ed18e535
--- /dev/null
+++ b/gcc/testsuite/g++.dg/parse/crash1.C
@@ -0,0 +1 @@
+struct s { s(std::b o) { } }; // { dg-error "" }