Merged r17459, r17462, r17474 into 3.20 branch.

src/objects.h

Index: src/objects.h
diff --git a/src/objects.h b/src/objects.h
index 178a61191185e443ac9ecb4d782e46dce426852b..0ca678f42e229ff41f44b407b6e7c04b82dd637a 100644
--- a/src/objects.h
+++ b/src/objects.h
@@ -7159,10 +7159,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);
 
@@ -7184,6 +7180,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)