Reland r26549 "Fix IsWeakObjectInOptimizedCode predicate to also include property...

BUG=v8:3882
LOG=NO

Review URL: https://codereview.chromium.org/913093002

Cr-Commit-Position: refs/heads/master@{#26573}

diff --git a/src/objects-inl.h b/src/objects-inl.h
index 4aadf12..c275ade 100644 (file)
--- a/src/objects-inl.h
+++ b/src/objects-inl.h
@@ -5242,7 +5242,11 @@ bool Code::IsWeakObjectInOptimizedCode(Object* object) {
     return Map::cast(object)->CanTransition() &&
            FLAG_weak_embedded_maps_in_optimized_code;
   }
-  if (object->IsCell()) object = Cell::cast(object)->value();
+  if (object->IsCell()) {
+    object = Cell::cast(object)->value();
+  } else if (object->IsPropertyCell()) {
+    object = PropertyCell::cast(object)->value();
+  }
   if (object->IsJSObject()) {
     return FLAG_weak_embedded_objects_in_optimized_code;
   }