From d91fe718a3750b4f2639d7a2eb75fef939ba9221 Mon Sep 17 00:00:00 2001 From: jakub Date: Thu, 26 Jan 2017 19:39:40 +0000 Subject: PR c++/68727 * cp-tree.def (OFFSETOF_EXPR): Bump number of operands to 2. * cp-tree.h (finish_offsetof): Add OBJECT_PTR argument. * parser.c (cp_parser_builtin_offsetof): Pass result of build_static_cast of null_pointer_node to finish_offsetof. * semantics.c (finish_offsetof): Add OBJECT_PTR argument, use it for -Winvalid-offsetof pedwarn instead of trying to guess original offsetof type from EXPR. Save OBJECT_PTR as a new second operand to OFFSETOF_EXPR. * pt.c (tsubst_copy_and_build) : Adjust finish_offsetof caller, pass the second operand of OFFSETOF_EXPR as OBJECT_PTR. * g++.dg/other/offsetof8.C: Add expected error. * g++.dg/other/offsetof9.C: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@244949 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/pt.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'gcc/cp/pt.c') diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 537d1073fa0..57334b4c44e 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -17707,8 +17707,15 @@ tsubst_copy_and_build (tree t, } case OFFSETOF_EXPR: - RETURN (finish_offsetof (RECUR (TREE_OPERAND (t, 0)), - EXPR_LOCATION (t))); + { + tree object_ptr + = tsubst_copy_and_build (TREE_OPERAND (t, 1), args, complain, + in_decl, /*function_p=*/false, + /*integral_constant_expression_p=*/false); + RETURN (finish_offsetof (object_ptr, + RECUR (TREE_OPERAND (t, 0)), + EXPR_LOCATION (t))); + } case ADDRESSOF_EXPR: RETURN (cp_build_addressof (EXPR_LOCATION (t), -- cgit v1.2.3