* mangle.c (write_expression): Correct handling of enumeration
	constants.
	(write_template_arg): Likewise.
	* pt.c (convert_template_argument): Do not fold non-type template
	arguments when inside a template.

	* g++.dg/abi/mangle16.C: New test.
	* g++.dg/abi/mangle17.C: Likewise.

From-SVN: r58234