gcc/cp/

	* pt.c (finish_call_expr, dependent_type_p)
	(type_dependent_expression_p): Revert the previous attempt to fix
	PR c++/47172.

gcc/testsuite/

    	* g++.dg/template/inherit6.C: Reverted.

From-SVN: r170055