A collection of context-related refactoring changes.

src/mark-compact.cc

Index: src/mark-compact.cc
diff --git a/src/mark-compact.cc b/src/mark-compact.cc
index 2f4522759f615b60cc283761308224b40d8f8787..4d9ae376bb3c54067860e870042f78f2462b18f1 100644
--- a/src/mark-compact.cc
+++ b/src/mark-compact.cc
@@ -670,8 +670,9 @@ class StaticMarkingVisitor : public StaticVisitorBase {
 
     Map* map = SafeMap(ctx);
     Heap* heap = map->heap();
-    if (!(map == heap->raw_unchecked_context_map() ||
+    if (!(map == heap->raw_unchecked_function_context_map() ||
           map == heap->raw_unchecked_catch_context_map() ||
+          map == heap->raw_unchecked_with_context_map() ||
           map == heap->raw_unchecked_global_context_map())) {
       return false;
     }