44 lines
2.2 KiB
Diff
44 lines
2.2 KiB
Diff
|
From ce53aec1f43f79c093db662a2e8e3062462757b4 Mon Sep 17 00:00:00 2001
|
||
|
|
From: xiezhiheng <xiezhiheng@huawei.com>
|
||
|
|
Date: Thu, 22 Aug 2024 16:35:28 +0800
|
||
|
|
Subject: [PATCH 153/157] [SME] Fix error by backported patches and IPA
|
||
|
|
prefetch
|
||
|
|
|
||
|
|
Fix
|
||
|
|
gtype-desc.cc: In function 'void gt_pch_p_30vec_cgraph_node__va_gc_atomic_(void*, void*, gt_pointer_operator, void*)':
|
||
|
|
gtype-desc.cc:11032:35: error: call of overloaded 'gt_pch_nx(vec<cgraph_node*, va_gc_atomic>*, void (*&)(void*, void*, void*), void*&)' is ambiguous
|
||
|
|
11032 | gt_pch_nx (&((*x)), op, cookie);
|
||
|
|
| ^
|
||
|
|
In file included from ../../gcc/hash-table.h:248,
|
||
|
|
from ../../gcc/coretypes.h:486,
|
||
|
|
from gtype-desc.cc:23:
|
||
|
|
../../gcc/vec.h:1395:1: note: candidate: 'void gt_pch_nx(vec<T*, A, vl_embed>*, gt_pointer_operator, void*) [with T = cgraph_node; A = va_gc_atomic; gt_pointer_operator = void (*)(void*, void*, void*)]'
|
||
|
|
1395 | gt_pch_nx (vec<T *, A, vl_embed> *v, gt_pointer_operator op, void *cookie)
|
||
|
|
| ^~~~~~~~~
|
||
|
|
../../gcc/vec.h:1403:1: note: candidate: 'void gt_pch_nx(vec<T, A, vl_embed>*, gt_pointer_operator, void*) [with T = cgraph_node*; A = va_gc_atomic; gt_pointer_operator = void (*)(void*, void*, void*)]'
|
||
|
|
1403 | gt_pch_nx (vec<T, A, vl_embed> *v, gt_pointer_operator op, void *cookie)
|
||
|
|
| ^~~~~~~~~
|
||
|
|
../../gcc/vec.h:1412:1: note: candidate: 'void gt_pch_nx(vec<T, va_gc_atomic, vl_embed>*, gt_pointer_operator, void*) [with T = cgraph_node*; gt_pointer_operator = void (*)(void*, void*, void*)]'
|
||
|
|
1412 | gt_pch_nx (vec<T, va_gc_atomic, vl_embed> *, gt_pointer_operator, void *)
|
||
|
|
| ^~~~~~~~~
|
||
|
|
---
|
||
|
|
gcc/cgraph.h | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/gcc/cgraph.h b/gcc/cgraph.h
|
||
|
|
index b84ff2f98..2332539e5 100644
|
||
|
|
--- a/gcc/cgraph.h
|
||
|
|
+++ b/gcc/cgraph.h
|
||
|
|
@@ -1660,7 +1660,7 @@ public:
|
||
|
|
/* ECF flags determined from the caller. */
|
||
|
|
int ecf_flags;
|
||
|
|
/* Vector of potential call targets determined by analysis. */
|
||
|
|
- vec<cgraph_node *, va_gc_atomic> *targets;
|
||
|
|
+ vec<cgraph_node *, va_gc> *targets;
|
||
|
|
|
||
|
|
/* Number of speculative call targets, it's less than GCOV_TOPN_VALUES. */
|
||
|
|
unsigned num_speculative_call_targets : 16;
|
||
|
|
--
|
||
|
|
2.33.0
|
||
|
|
|