mangle.c (write_nested_name): Use decl_mangling_context.

	* mangle.c (write_nested_name): Use decl_mangling_context.
	(write_prefix, write_template_prefix): Likewise.

From-SVN: r184875

gcc/cp/ChangeLog

 2012-03-03  Jason Merrill  <jason@redhat.com>
 
+	* mangle.c (write_nested_name): Use decl_mangling_context.
+	(write_prefix, write_template_prefix): Likewise.
+
 	PR c++/36797
 	* mangle.c (write_expression): Improve diagnostic for TRAIT_EXPR.
 

gcc/cp/mangle.c

@@ -942,7 +942,7 @@ write_nested_name (const tree decl)
 	}
       else
 	{
-	  write_prefix (CP_DECL_CONTEXT (decl));
+	  write_prefix (decl_mangling_context (decl));
 	  write_unqualified_name (decl);
 	}
     }
@@ -1030,7 +1030,7 @@ write_prefix (const tree node)
 	}
       else
 	{
-	  write_prefix (CP_DECL_CONTEXT (decl));
+	  write_prefix (decl_mangling_context (decl));
 	  write_unqualified_name (decl);
 	}
     }
@@ -1060,7 +1060,7 @@ write_template_prefix (const tree node)
 {
   tree decl = DECL_P (node) ? node : TYPE_NAME (node);
   tree type = DECL_P (node) ? TREE_TYPE (node) : node;
-  tree context = CP_DECL_CONTEXT (decl);
+  tree context = decl_mangling_context (decl);
   tree template_info;
   tree templ;
   tree substitution;