[strong] Refactor out separate strong runtime call for class objects

src/runtime/runtime-classes.cc

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdlib.h>
 #include <limits>
 
 #include "src/v8.h"
 
 #include "src/arguments.h"
@@ skipping 244 matching lines @@
 
 RUNTIME_FUNCTION(Runtime_FinalizeClassDefinition) {
   HandleScope scope(isolate);
   DCHECK(args.length() == 2);
   CONVERT_ARG_HANDLE_CHECKED(JSObject, constructor, 0);
   CONVERT_ARG_HANDLE_CHECKED(JSObject, prototype, 1);
 
   JSObject::MigrateSlowToFast(prototype, 0, "RuntimeToFastProperties");
   JSObject::MigrateSlowToFast(constructor, 0, "RuntimeToFastProperties");
 
+  if (constructor->map()->is_strong()) {
+    RETURN_FAILURE_ON_EXCEPTION(isolate, JSObject::Freeze(prototype));

[rossberg, 2015/08/05 14:25:58]

How about adding a DCHECK(prototype->map()->is_strong()) here?

[conradw, 2015/08/05 14:30:00]

Done.

+    Handle<Object> result;
+    ASSIGN_RETURN_FAILURE_ON_EXCEPTION(isolate, result,
+                                       JSObject::Freeze(constructor));
+    return *result;
+  }
   return *constructor;
 }
 
 
-RUNTIME_FUNCTION(Runtime_FinalizeClassDefinitionStrong) {
-  HandleScope scope(isolate);
-  DCHECK(args.length() == 2);
-  CONVERT_ARG_HANDLE_CHECKED(JSObject, constructor, 0);
-  CONVERT_ARG_HANDLE_CHECKED(JSObject, prototype, 1);
-
-  JSObject::MigrateSlowToFast(prototype, 0, "RuntimeToFastProperties");
-  JSObject::MigrateSlowToFast(constructor, 0, "RuntimeToFastProperties");
-
-  RETURN_FAILURE_ON_EXCEPTION(isolate, JSObject::Freeze(prototype));
-  Handle<Object> result;
-  ASSIGN_RETURN_FAILURE_ON_EXCEPTION(isolate, result,
-                                     JSObject::Freeze(constructor));
-  return *result;
-}
-
-
 RUNTIME_FUNCTION(Runtime_ClassGetSourceCode) {
   HandleScope shs(isolate);
   DCHECK(args.length() == 1);
   CONVERT_ARG_HANDLE_CHECKED(JSFunction, fun, 0);
 
   Handle<Object> script;
   ASSIGN_RETURN_FAILURE_ON_EXCEPTION(
       isolate, script,
       Object::GetProperty(fun, isolate->factory()->class_script_symbol()));
   if (!script->IsScript()) {
@@ skipping 294 matching lines @@
   Handle<Object> result;
   ASSIGN_RETURN_FAILURE_ON_EXCEPTION(
       isolate, result,
       Execution::Call(isolate, reflect, isolate->factory()->undefined_value(),
                       arraysize(argv), argv));
 
   return *result;
 }
 }  // namespace internal
 }  // namespace v8