* decl.c (shadow_label): Don't treat decls as identifiers.
	(maybe_push_to_top_level): Clear shadowed_labels.
	* pt.c (instantiate_decl): Reset lineno and filename after calling
	regenerate_decl_from_template.

From-SVN: r20093