[Isolates] Merge r 6300:6500 from bleeding_edge to isolates.

src/objects.cc

Index: src/objects.cc
===================================================================
--- src/objects.cc	(revision 6955)
+++ src/objects.cc	(working copy)
@@ -5491,7 +5491,8 @@
 
 void JSFunction::MarkForLazyRecompilation() {
   ASSERT(is_compiled() && !IsOptimized());
-  ASSERT(shared()->allows_lazy_compilation());
+  ASSERT(shared()->allows_lazy_compilation() ||
+         code()->optimizable());
   Builtins* builtins = GetIsolate()->builtins();
   ReplaceCode(builtins->builtin(Builtins::LazyRecompile));
 }