diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cdb5791b501..418c3799f52 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-11-04  Martin Liska  <mliska@suse.cz>
+
+	PR ipa/92304
+	* fold-const.c (operand_compare::hash_operand): Fix field
+	hashing of CONSTRUCTOR.
+
 2019-11-04  Martin Liska  <mliska@suse.cz>
 
 	* ggc.h (ggc_delete): New function.
diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index fce503692fd..1e25859a707 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -3659,6 +3659,9 @@ operand_compare::hash_operand (const_tree t, inchash::hash &hstate,
 	flags &= ~OEP_ADDRESS_OF;
 	FOR_EACH_CONSTRUCTOR_ELT (CONSTRUCTOR_ELTS (t), idx, field, value)
 	  {
+	    /* In GIMPLE the indexes can be either NULL or matching i.  */
+	    if (field == NULL_TREE)
+	      field = bitsize_int (idx);
 	    hash_operand (field, hstate, flags);
 	    hash_operand (value, hstate, flags);
 	  }