Merged r17459, r17462, r17474 into 3.21 branch.

src/objects.h

Index: src/objects.h
diff --git a/src/objects.h b/src/objects.h
index d3593b6edce9003f38fbceee97d72c503bb47368..12087eb00a6d34fefacd9a412f85c1c493659da8 100644
--- a/src/objects.h
+++ b/src/objects.h
@@ -7201,10 +7201,6 @@ class GlobalObject: public JSObject {
     return answer;
   }
 
-  // Ensure that the global object has a cell for the given property name.
-  static Handle<PropertyCell> EnsurePropertyCell(Handle<GlobalObject> global,
-                                                 Handle<Name> name);
-
   // Casting.
   static inline GlobalObject* cast(Object* obj);
 
@@ -7226,6 +7222,10 @@ class JSGlobalObject: public GlobalObject {
   // Casting.
   static inline JSGlobalObject* cast(Object* obj);
 
+  // Ensure that the global object has a cell for the given property name.
+  static Handle<PropertyCell> EnsurePropertyCell(Handle<JSGlobalObject> global,
+                                                 Handle<Name> name);
+
   // Dispatched behavior.
   DECLARE_PRINTER(JSGlobalObject)
   DECLARE_VERIFIER(JSGlobalObject)