diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 08fbb76b87a040fdf1e369221dae5a417ede223d..da6fca8546a1f9b0a821aff15de2a1b249fdeeb7 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+Mon Apr 17 17:11:16 2000  Mark P Mitchell  <mark@codesourcery.com>
+
+	* method.c (make_thunk): Set DECL_CONTEXT for a THUNK_DECL.
+
 2000-04-16  Mark Mitchell  <mark@codesourcery.com>
 
 	* class.c (build_vtable_entry): Don't build thunks for type-info
diff --git a/gcc/cp/method.c b/gcc/cp/method.c
index 4d28c209af20615f30a7de074d07977fce94f7a3..31b02be8a18a53cb15d4a1bdf94d8a10baa2529b 100644
--- a/gcc/cp/method.c
+++ b/gcc/cp/method.c
@@ -2065,6 +2065,7 @@ make_thunk (function, delta, vcall_index)
 	= vcall_index * int_size_in_bytes (vtable_entry_type);
       DECL_EXTERNAL (thunk) = 1;
       DECL_ARTIFICIAL (thunk) = 1;
+      DECL_CONTEXT (thunk) = DECL_CONTEXT (func_decl);
       /* So that finish_file can write out any thunks that need to be: */
       pushdecl_top_level (thunk);
     }