Revert of Reland [heap] Avoid the use of cells to point from code to new-space objects.

test/cctest/heap/test-heap.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 4799 matching lines @@
   }
 
   // Now make sure that a gc should get rid of the function
   for (int i = 0; i < 4; i++) {
     heap->CollectAllGarbage();
   }
 
   CHECK(code->marked_for_deoptimization());
 }
 
-TEST(NewSpaceObjectsInOptimizedCode) {
-  if (i::FLAG_always_opt || !i::FLAG_crankshaft || i::FLAG_turbo) return;
-  i::FLAG_weak_embedded_objects_in_optimized_code = true;
-  i::FLAG_allow_natives_syntax = true;
-  CcTest::InitializeVM();
-  Isolate* isolate = CcTest::i_isolate();
-  v8::internal::Heap* heap = CcTest::heap();
-
-  if (!isolate->use_crankshaft()) return;
-  HandleScope outer_scope(heap->isolate());
-  Handle<Code> code;
-  {
-    LocalContext context;
-    HandleScope scope(heap->isolate());
-
-    CompileRun(
-        "var foo;"
-        "var bar;"
-        "(function() {"
-        "  function foo_func(x) { with (x) { return 1 + x; } };"
-        "  %NeverOptimizeFunction(foo_func);"
-        "  function bar_func() {"
-        "    return foo(1);"
-        "  };"
-        "  bar = bar_func;"
-        "  foo = foo_func;"
-        "  bar_func();"
-        "  bar_func();"
-        "  bar_func();"
-        "  %OptimizeFunctionOnNextCall(bar_func);"
-        "  bar_func();"
-        "})();");
-
-    Handle<JSFunction> bar = Handle<JSFunction>::cast(v8::Utils::OpenHandle(
-        *v8::Local<v8::Function>::Cast(CcTest::global()
-                                           ->Get(context.local(), v8_str("bar"))
-                                           .ToLocalChecked())));
-
-    Handle<JSFunction> foo = Handle<JSFunction>::cast(v8::Utils::OpenHandle(
-        *v8::Local<v8::Function>::Cast(CcTest::global()
-                                           ->Get(context.local(), v8_str("foo"))
-                                           .ToLocalChecked())));
-
-    CHECK(heap->InNewSpace(*foo));
-    heap->CollectGarbage(NEW_SPACE);
-    heap->CollectGarbage(NEW_SPACE);
-    CHECK(!heap->InNewSpace(*foo));
-#ifdef VERIFY_HEAP
-    heap->Verify();
-#endif
-    CHECK(!bar->code()->marked_for_deoptimization());
-    code = scope.CloseAndEscape(Handle<Code>(bar->code()));
-  }
-
-  // Now make sure that a gc should get rid of the function
-  for (int i = 0; i < 4; i++) {
-    heap->CollectAllGarbage();
-  }
-
-  CHECK(code->marked_for_deoptimization());
-}
 
 TEST(NoWeakHashTableLeakWithIncrementalMarking) {
   if (i::FLAG_always_opt || !i::FLAG_crankshaft) return;
   if (!i::FLAG_incremental_marking) return;
   i::FLAG_weak_embedded_objects_in_optimized_code = true;
   i::FLAG_allow_natives_syntax = true;
   i::FLAG_compilation_cache = false;
   i::FLAG_retain_maps_for_n_gc = 0;
   CcTest::InitializeVM();
   Isolate* isolate = CcTest::i_isolate();
@@ skipping 1895 matching lines @@
   int mark_sweeps_performed = mark_sweep_count_after - mark_sweep_count_before;
   // The memory pressuer handler either performed two GCs or performed one and
   // started incremental marking.
   CHECK(mark_sweeps_performed == 2 ||
         (mark_sweeps_performed == 1 &&
          !heap->incremental_marking()->IsStopped()));
 }
 
 }  // namespace internal
 }  // namespace v8