diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 738a74def20..5541d9c62d9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2020-04-29  Jakub Jelinek  <jakub@redhat.com>
 
+	PR target/94706
+	* config/ia64/ia64.c (hfa_element_mode): Use DECL_FIELD_ABI_IGNORED
+	instead of cxx17_empty_base_field_p.
+
 	PR target/94707
 	* tree-core.h (tree_decl_common): Note decl_flag_0 used for
 	DECL_FIELD_ABI_IGNORED.
diff --git a/gcc/config/ia64/ia64.c b/gcc/config/ia64/ia64.c
index 4b7bf698176..7075d6a0b92 100644
--- a/gcc/config/ia64/ia64.c
+++ b/gcc/config/ia64/ia64.c
@@ -4665,7 +4665,7 @@ hfa_element_mode (const_tree type, bool nested)
     case QUAL_UNION_TYPE:
       for (t = TYPE_FIELDS (type); t; t = DECL_CHAIN (t))
 	{
-	  if (TREE_CODE (t) != FIELD_DECL || cxx17_empty_base_field_p (t))
+	  if (TREE_CODE (t) != FIELD_DECL || DECL_FIELD_ABI_IGNORED (t))
 	    continue;
 
 	  mode = hfa_element_mode (TREE_TYPE (t), 1);