aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorMark Mitchell <mark@markmitchell.com>1998-06-08 00:20:34 +0000
committerMark Mitchell <mmitchel@gcc.gnu.org>1998-06-08 00:20:34 +0000
commit53b22f3db7f0546810d90a0577bfdb8913b1434a (patch)
tree5702f7a06f35fbb0a40e5e56004539a1ff2f0433 /gcc
parent2b01d264b1f00be0d8371e2b904db463da604eb0 (diff)
downloadgcc-53b22f3db7f0546810d90a0577bfdb8913b1434a.zip
gcc-53b22f3db7f0546810d90a0577bfdb8913b1434a.tar.gz
gcc-53b22f3db7f0546810d90a0577bfdb8913b1434a.tar.bz2
init.c (build_offset_ref): Correct previous change to use build, not build_min.
* init.c (build_offset_ref): Correct previous change to use build, not build_min. From-SVN: r20319
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/init.c7
2 files changed, 9 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 57ec88a..07178e7 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+1998-06-08 Mark Mitchell <mark@markmitchell.com>
+
+ * init.c (build_offset_ref): Correct previous change to use build,
+ not build_min.
+
1998-06-07 Mark Mitchell <mark@markmitchell.com>
* class.c (instantiate_type): Handle pointer-to-members where the
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index b7b74c0..c9de483 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -1621,9 +1621,10 @@ build_offset_ref (type, name)
if (type == std_node)
return do_scoped_id (name, 0);
- if (processing_template_decl || uses_template_parms (type)
- || TREE_CODE (name) == TEMPLATE_ID_EXPR)
- return build_min (SCOPE_REF, unknown_type_node, type, name);
+ if (processing_template_decl || uses_template_parms (type))
+ return build_min_nt (SCOPE_REF, type, name);
+ else if (TREE_CODE (name) == TEMPLATE_ID_EXPR)
+ return build (SCOPE_REF, unknown_type_node, type, name);
/* Handle namespace names fully here. */
if (TREE_CODE (type) == NAMESPACE_DECL)