Merged r13361, r13481 into 3.15 branch.

src/objects.cc

Index: src/objects.cc
diff --git a/src/objects.cc b/src/objects.cc
index 885a5dd8b25874f181c5c346e0b990b9bdf394cd..126d1e0fd73edc4d819aae5e09bf8e6b4453deaf 100644
--- a/src/objects.cc
+++ b/src/objects.cc
@@ -8562,7 +8562,7 @@ void SharedFunctionInfo::EnableDeoptimizationSupport(Code* recompiled) {
     // old code, we have to replace it. We should try to avoid this
     // altogether because it flushes valuable type feedback by
     // effectively resetting all IC state.
-    set_code(recompiled);
+    ReplaceCode(recompiled);
   }
   ASSERT(has_deoptimization_support());
 }