Commit da67227b by Jakub Jelinek

ipa: Various diagnostic fixes [PR93797]

As the patch shows, various messages didn't match the field names they are
talking about.

2020-02-18  Jakub Jelinek  <jakub@redhat.com>

	PR ipa/93797
	* cgraph.c (verify_speculative_call): Use speculative_id instead of
	speculative_uid in messages.  Remove trailing whitespace from error
	message.  Use num_speculative_call_targets instead of
	num_speculative_targets in a message.
	(cgraph_node::verify_node): Use call_stmt instead of cal_stmt in
	edge messages and stmt instead of cal_stmt in reference message.
parent be7c145a
2020-02-18 Jakub Jelinek <jakub@redhat.com> 2020-02-18 Jakub Jelinek <jakub@redhat.com>
PR ipa/93797
* cgraph.c (verify_speculative_call): Use speculative_id instead of
speculative_uid in messages. Remove trailing whitespace from error
message. Use num_speculative_call_targets instead of
num_speculative_targets in a message.
(cgraph_node::verify_node): Use call_stmt instead of cal_stmt in
edge messages and stmt instead of cal_stmt in reference message.
PR tree-optimization/93780 PR tree-optimization/93780
* tree-ssa.c (non_rewritable_lvalue_p): Check valid_vector_subparts_p * tree-ssa.c (non_rewritable_lvalue_p): Check valid_vector_subparts_p
before calling build_vector_type. before calling build_vector_type.
......
...@@ -3230,14 +3230,14 @@ verify_speculative_call (struct cgraph_node *node, gimple *stmt, ...@@ -3230,14 +3230,14 @@ verify_speculative_call (struct cgraph_node *node, gimple *stmt,
if (direct->speculative_id >= num) if (direct->speculative_id >= num)
{ {
error ("direct call to %s in speculative call sequence has " error ("direct call to %s in speculative call sequence has "
"speculative_uid %i out of range", "speculative_id %i out of range",
direct->callee->dump_name (), direct->speculative_id); direct->callee->dump_name (), direct->speculative_id);
return true; return true;
} }
if (direct_calls[direct->speculative_id]) if (direct_calls[direct->speculative_id])
{ {
error ("duplicate direct call to %s in speculative call sequence " error ("duplicate direct call to %s in speculative call sequence "
"with speculative_uid %i", "with speculative_id %i",
direct->callee->dump_name (), direct->speculative_id); direct->callee->dump_name (), direct->speculative_id);
return true; return true;
} }
...@@ -3248,7 +3248,7 @@ verify_speculative_call (struct cgraph_node *node, gimple *stmt, ...@@ -3248,7 +3248,7 @@ verify_speculative_call (struct cgraph_node *node, gimple *stmt,
&& first_call != node->get_edge (first_call->call_stmt)) && first_call != node->get_edge (first_call->call_stmt))
{ {
error ("call stmt hash does not point to first direct edge of " error ("call stmt hash does not point to first direct edge of "
"speculative call sequence "); "speculative call sequence");
return true; return true;
} }
...@@ -3260,14 +3260,14 @@ verify_speculative_call (struct cgraph_node *node, gimple *stmt, ...@@ -3260,14 +3260,14 @@ verify_speculative_call (struct cgraph_node *node, gimple *stmt,
if (ref->speculative_id >= num) if (ref->speculative_id >= num)
{ {
error ("direct call to %s in speculative call sequence has " error ("direct call to %s in speculative call sequence has "
"speculative_uid %i out of range", "speculative_id %i out of range",
ref->referred->dump_name (), ref->speculative_id); ref->referred->dump_name (), ref->speculative_id);
return true; return true;
} }
if (refs[ref->speculative_id]) if (refs[ref->speculative_id])
{ {
error ("duplicate reference %s in speculative call sequence " error ("duplicate reference %s in speculative call sequence "
"with speculative_uid %i", "with speculative_id %i",
ref->referred->dump_name (), ref->speculative_id); ref->referred->dump_name (), ref->speculative_id);
return true; return true;
} }
...@@ -3294,7 +3294,7 @@ verify_speculative_call (struct cgraph_node *node, gimple *stmt, ...@@ -3294,7 +3294,7 @@ verify_speculative_call (struct cgraph_node *node, gimple *stmt,
if (num_targets != indirect->num_speculative_call_targets_p ()) if (num_targets != indirect->num_speculative_call_targets_p ())
{ {
error ("number of speculative targets %i mismatched with " error ("number of speculative targets %i mismatched with "
"num_speculative_targets %i", "num_speculative_call_targets %i",
num_targets, num_targets,
indirect->num_speculative_call_targets_p ()); indirect->num_speculative_call_targets_p ());
return true; return true;
...@@ -3400,7 +3400,7 @@ cgraph_node::verify_node (void) ...@@ -3400,7 +3400,7 @@ cgraph_node::verify_node (void)
} }
if (e->call_stmt && e->lto_stmt_uid) if (e->call_stmt && e->lto_stmt_uid)
{ {
error ("edge has both cal_stmt and lto_stmt_uid set"); error ("edge has both call_stmt and lto_stmt_uid set");
error_found = true; error_found = true;
} }
} }
...@@ -3471,7 +3471,7 @@ cgraph_node::verify_node (void) ...@@ -3471,7 +3471,7 @@ cgraph_node::verify_node (void)
} }
if (e->call_stmt && e->lto_stmt_uid) if (e->call_stmt && e->lto_stmt_uid)
{ {
error ("edge has both cal_stmt and lto_stmt_uid set"); error ("edge has both call_stmt and lto_stmt_uid set");
error_found = true; error_found = true;
} }
if (e->speculative if (e->speculative
...@@ -3509,7 +3509,7 @@ cgraph_node::verify_node (void) ...@@ -3509,7 +3509,7 @@ cgraph_node::verify_node (void)
{ {
if (ref->stmt && ref->lto_stmt_uid) if (ref->stmt && ref->lto_stmt_uid)
{ {
error ("reference has both cal_stmt and lto_stmt_uid set"); error ("reference has both stmt and lto_stmt_uid set");
error_found = true; error_found = true;
} }
if (ref->speculative if (ref->speculative
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment