88 lines
2.5 KiB
Diff
88 lines
2.5 KiB
Diff
Source: 2019-06-21 Jeff Law <law@redhat.com>
|
|
Upstream: yes
|
|
Reason: PR tree-optimization/90949
|
|
* tree-ssa-copy.c (fini_copy_prop): Use reset_flow_sensitive_info.
|
|
* tree-ssanames.c (reset_flow_sensitive_info): Reset non-null state.
|
|
|
|
--- gcc/tree-ssa-copy.c 2019-01-01 13:31:55.000000000 +0100
|
|
+++ gcc/tree-ssa-copy.c 2019-06-26 18:50:01.030395471 +0200
|
|
@@ -545,13 +545,12 @@
|
|
duplicate_ssa_name_ptr_info (copy_of[i].value,
|
|
SSA_NAME_PTR_INFO (var));
|
|
/* Points-to information is cfg insensitive,
|
|
- but alignment info might be cfg sensitive, if it
|
|
- e.g. is derived from VRP derived non-zero bits.
|
|
- So, do not copy alignment info if the two SSA_NAMEs
|
|
- aren't defined in the same basic block. */
|
|
+ but [E]VRP might record context sensitive alignment
|
|
+ info, non-nullness, etc. So reset context sensitive
|
|
+ info if the two SSA_NAMEs aren't defined in the same
|
|
+ basic block. */
|
|
if (var_bb != copy_of_bb)
|
|
- mark_ptr_info_alignment_unknown
|
|
- (SSA_NAME_PTR_INFO (copy_of[i].value));
|
|
+ reset_flow_sensitive_info (copy_of[i].value);
|
|
}
|
|
else if (!POINTER_TYPE_P (TREE_TYPE (var))
|
|
&& SSA_NAME_RANGE_INFO (var)
|
|
--- gcc/tree-ssanames.c 2019-03-18 14:59:11.000000000 +0100
|
|
+++ gcc/tree-ssanames.c 2019-06-26 18:50:11.282394906 +0200
|
|
@@ -820,7 +820,12 @@
|
|
{
|
|
/* points-to info is not flow-sensitive. */
|
|
if (SSA_NAME_PTR_INFO (name))
|
|
- mark_ptr_info_alignment_unknown (SSA_NAME_PTR_INFO (name));
|
|
+ {
|
|
+ /* [E]VRP can derive context sensitive alignment info and
|
|
+ non-nullness properties. We must reset both. */
|
|
+ mark_ptr_info_alignment_unknown (SSA_NAME_PTR_INFO (name));
|
|
+ SSA_NAME_PTR_INFO (name)->pt.null = 1;
|
|
+ }
|
|
}
|
|
else
|
|
SSA_NAME_RANGE_INFO (name) = NULL;
|
|
--- /dev/null
|
|
+++ gcc/testsuite/gcc.c-torture/pr90949.c 2019-06-26 18:53:16.870384679 +0200
|
|
@@ -0,0 +1,42 @@
|
|
+void __attribute__ ((noipa, noinline)) my_puts (const char *str) { }
|
|
+
|
|
+void __attribute__ ((noipa, noinline)) my_free (void *p) { }
|
|
+
|
|
+
|
|
+struct Node
|
|
+{
|
|
+ struct Node *child;
|
|
+};
|
|
+
|
|
+struct Node space[2] = { };
|
|
+
|
|
+struct Node * __attribute__ ((noipa, noinline)) my_malloc (int bytes)
|
|
+{
|
|
+ return &space[0];
|
|
+}
|
|
+
|
|
+void
|
|
+walk (struct Node *module, int cleanup)
|
|
+{
|
|
+ if (module == 0)
|
|
+ {
|
|
+ return;
|
|
+ }
|
|
+ if (!cleanup)
|
|
+ {
|
|
+ my_puts ("No cleanup");
|
|
+ }
|
|
+ walk (module->child, cleanup);
|
|
+ if (cleanup)
|
|
+ {
|
|
+ my_free (module);
|
|
+ }
|
|
+}
|
|
+
|
|
+int
|
|
+main ()
|
|
+{
|
|
+ struct Node *node = my_malloc (sizeof (struct Node));
|
|
+ node->child = 0;
|
|
+ walk (node, 1);
|
|
+}
|