[Isolates] Merge (7083,7111] from bleeding_edge.

src/code-stubs.cc

Index: src/code-stubs.cc
diff --git a/src/code-stubs.cc b/src/code-stubs.cc
index ddf20c978f62375b95403574b9c08ff48cdcdd6e..15cbfe661d20860ac8d2bf0032dbbc72daf1b761 100644
--- a/src/code-stubs.cc
+++ b/src/code-stubs.cc
@@ -101,7 +101,8 @@ Handle<Code> CodeStub::GetCode() {
         static_cast<Code::Kind>(GetCodeKind()),
         InLoop(),
         GetICState());
-    Handle<Code> new_object = FACTORY->NewCode(desc, flags, masm.CodeObject());
+    Handle<Code> new_object = FACTORY->NewCode(
+        desc, flags, masm.CodeObject(), NeedsImmovableCode());
     RecordCodeGeneration(*new_object, &masm);
     FinishCode(*new_object);
 
@@ -116,6 +117,7 @@ Handle<Code> CodeStub::GetCode() {
     code = *new_object;
   }
 
+  ASSERT(!NeedsImmovableCode() || HEAP->lo_space()->Contains(code));
   return Handle<Code>(code);
 }