diff --git a/gcc/config/i386/i386-features.cc b/gcc/config/i386/i386-features.cc
index f95f30f84cd..e866581dc3c 100644
--- a/gcc/config/i386/i386-features.cc
+++ b/gcc/config/i386/i386-features.cc
@@ -5629,7 +5629,7 @@ make_resolver_func (const tree default_decl,
 
   tree id = ix86_mangle_decl_assembler_name
     (decl, node->function_version ()->assembler_name);
-  SET_DECL_ASSEMBLER_NAME (decl, id);
+  symtab->change_decl_assembler_name (decl, id);
 
   DECL_NAME (decl) = DECL_NAME (default_decl);
   TREE_USED (decl) = 1;
diff --git a/gcc/testsuite/gcc.target/i386/tct-ipa-inline-ice.c b/gcc/testsuite/gcc.target/i386/tct-ipa-inline-ice.c
new file mode 100644
index 00000000000..b8f77372e00
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/tct-ipa-inline-ice.c
@@ -0,0 +1,48 @@
+/* Test function multiversioning and inlining of a function with a
+   target_clones attribute.  Note, we need to allow inlining of
+   target_clones functions, see
+   "Do not inline functions with multiple clone targets." in c-attribs.cc,
+   otherwise the test would not trigger the ICE.  */
+/* { dg-do assemble } */
+/* { dg-require-ifunc "" } */
+/* { dg-options "-O3" } */
+
+struct range_state
+{
+  unsigned int n;
+  unsigned int s[58];
+  unsigned int *q[58];
+};
+
+struct coder_state
+{
+  struct range_state r;
+  unsigned int t;
+  unsigned int x[12];
+};
+
+inline void
+bar(struct range_state *r, unsigned int *ptr, unsigned int value)
+{
+  r->s[r->n] = value;
+  r->q[r->n] = ptr;
+  ++r->n;
+}
+
+__attribute__((target_clones("default", "arch=x86-64-v2")))
+inline void
+foo(struct coder_state *c, unsigned int back)
+{
+  if (back == ~0u) {
+    bar(&c->r, &c->x[c->t], 0);
+  }
+}
+
+__attribute__((target_clones("default", "arch=x86-64-v2")))
+int
+ice_trigger(struct coder_state *c, unsigned int back)
+{
+  while (1) {
+    foo(c, back);
+  }
+}