From ae9e7e16cd1b1a82cfc2367d98a54ee0ec1197db Mon Sep 17 00:00:00 2001
From: Nathan Sidwell <nathan@acm.org>
Date: Thu, 1 Apr 1999 12:23:07 +0000
Subject: [PATCH] cvt.c (convert_pointer_to_real): Use same_type_p.

        * cvt.c (convert_pointer_to_real): Use same_type_p.
	* typeck.c (comp_target_types): Use same_type_p.

From-SVN: r26105
---
 gcc/cp/ChangeLog | 5 +++++
 gcc/cp/cvt.c     | 2 +-
 gcc/cp/typeck.c  | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e96a2746561e..948736da48d3 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar 31 11:30:43 BST 1999  Nathan Sidwell  <nathan@acm.org>
+
+	* cvt.c (convert_pointer_to_real): Use same_type_p.
+	* typeck.c (comp_target_types): Use same_type_p.
+
 1999-03-31  Jason Merrill  <jason@yorick.cygnus.com>
 
 	* semantics.c (begin_inline_definitions,
diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c
index d03cff5df65e..cef8bc8eb749 100644
--- a/gcc/cp/cvt.c
+++ b/gcc/cp/cvt.c
@@ -579,7 +579,7 @@ convert_pointer_to_real (binfo, expr)
   ptr_type = cp_build_qualified_type (type,
 				      CP_TYPE_QUALS (TREE_TYPE (intype)));
   ptr_type = build_pointer_type (ptr_type);
-  if (ptr_type == TYPE_MAIN_VARIANT (intype))
+  if (same_type_p (ptr_type, TYPE_MAIN_VARIANT (intype)))
     return expr;
 
   my_friendly_assert (!integer_zerop (expr), 191);
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 2012546f6f4c..77cdf0567448 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -1021,7 +1021,7 @@ comp_target_types (ttl, ttr, nptrs)
 {
   ttl = TYPE_MAIN_VARIANT (ttl);
   ttr = TYPE_MAIN_VARIANT (ttr);
-  if (ttl == ttr)
+  if (same_type_p (ttl, ttr))
     return 1;
 
   if (TREE_CODE (ttr) != TREE_CODE (ttl))
-- 
GitLab