diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index dc9f1cac4d7..e5ca35d90e5 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2009-08-15  Jason Merrill  <jason@redhat.com>
+
+	* decl2.c (mark_used): It's ok to synthesize for default args now.
+
 2009-08-10  Jason Merrill  <jason@redhat.com>
 
 	Implement DR 757: It's OK for a decl to use a type without linkage
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 610d62d2e60..4644427eb03 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -3943,12 +3943,7 @@ mark_used (tree decl)
       && DECL_NONSTATIC_MEMBER_FUNCTION_P (decl)
       && DECL_DEFAULTED_FN (decl)
       && !DECL_THUNK_P (decl)
-      && ! DECL_INITIAL (decl)
-      /* Kludge: don't synthesize for default args.  Unfortunately this
-	 rules out initializers of namespace-scoped objects too, but
-	 it's sort-of ok if the implicit ctor or dtor decl keeps
-	 pointing to the class location.  */
-      && current_function_decl)
+      && ! DECL_INITIAL (decl))
     {
       synthesize_method (decl);
       /* If we've already synthesized the method we don't need to