diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 8f4d37577fd..862e8597086 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-22  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* cp-tree.h (DERIVED_FROM_P): Pass tf_none to lookup_base, not
+	tf_warning_or_error.
+
 2013-07-21   Ondřej Bílka  <neleai@seznam.cz>
 
 	* class.c: Fix typos.
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index a837d2275a3..459c0e27ef3 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -1320,8 +1320,7 @@ enum languages { lang_c, lang_cplusplus, lang_java };
 /* Nonzero iff TYPE is derived from PARENT. Ignores accessibility and
    ambiguity issues.  */
 #define DERIVED_FROM_P(PARENT, TYPE) \
-  (lookup_base ((TYPE), (PARENT), ba_any, NULL, tf_warning_or_error)\
-   != NULL_TREE)
+  (lookup_base ((TYPE), (PARENT), ba_any, NULL, tf_none) != NULL_TREE)
 
 /* Gives the visibility specification for a class type.  */
 #define CLASSTYPE_VISIBILITY(TYPE)		\