aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2018-03-29 15:38:35 -0400
committerJason Merrill <jason@gcc.gnu.org>2018-03-29 15:38:35 -0400
commit8de4a6749d16ac2663ee5a071906b8d469ad9049 (patch)
treee8b13f0d2aaa514c52d61344f1d07be2d31daf2d /gcc
parente597f6822c64f3886bdfa7f6a371470cdb642903 (diff)
downloadgcc-8de4a6749d16ac2663ee5a071906b8d469ad9049.zip
gcc-8de4a6749d16ac2663ee5a071906b8d469ad9049.tar.gz
gcc-8de4a6749d16ac2663ee5a071906b8d469ad9049.tar.bz2
* pt.c (build_non_dependent_expr): Propagate expr location.
From-SVN: r258963
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog4
-rw-r--r--gcc/cp/pt.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 454866e..cc950e8 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2018-03-29 Jason Merrill <jason@redhat.com>
+
+ * pt.c (build_non_dependent_expr): Propagate expr location.
+
2018-03-27 Jason Merrill <jason@redhat.com>
PR c++/85060 - wrong-code with call to base member in template.
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 07dad99..40ddf9e 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -25473,7 +25473,8 @@ build_non_dependent_expr (tree expr)
gcc_assert (TREE_TYPE (expr) != unknown_type_node);
/* Otherwise, build a NON_DEPENDENT_EXPR. */
- return build1 (NON_DEPENDENT_EXPR, TREE_TYPE (expr), expr);
+ return build1_loc (EXPR_LOCATION (orig_expr), NON_DEPENDENT_EXPR,
+ TREE_TYPE (expr), expr);
}
/* ARGS is a vector of expressions as arguments to a function call.