aboutsummaryrefslogtreecommitdiff
path: root/gcc/c-family/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/c-family/ChangeLog')
-rw-r--r--gcc/c-family/ChangeLog15
1 files changed, 15 insertions, 0 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index e975b3ae0bf..6499c089fbb 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,18 @@
+2018-05-30 Jakub Jelinek <jakub@redhat.com>
+
+ Backported from mainline
+ 2018-05-10 Jakub Jelinek <jakub@redhat.com>
+
+ PR c++/85662
+ * c-common.h (fold_offsetof_1): Removed.
+ (fold_offsetof): Add TYPE argument defaulted to size_type_node and
+ CTX argument defaulted to ERROR_MARK.
+ * c-common.c (fold_offsetof_1): Renamed to ...
+ (fold_offsetof): ... this. Remove wrapper function. Add TYPE
+ argument, convert the pointer constant to TYPE and use size_binop
+ with PLUS_EXPR instead of fold_build_pointer_plus if type is not
+ a pointer type. Adjust recursive calls.
+
2018-05-26 Jakub Jelinek <jakub@redhat.com>
PR bootstrap/85921