[es6] Perform the IsConstructor test in GetSuperConstructor.

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 "src/runtime/runtime-utils.h"
 
 #include <stdlib.h>
 #include <limits>
 
 #include "src/accessors.h"
 #include "src/arguments.h"
 #include "src/debug/debug.h"
 #include "src/frames-inl.h"
 #include "src/isolate-inl.h"
 #include "src/messages.h"
 #include "src/runtime/runtime.h"
 
 namespace v8 {
 namespace internal {
 
 
 RUNTIME_FUNCTION(Runtime_ThrowNonMethodError) {
   HandleScope scope(isolate);
   DCHECK(args.length() == 0);
   THROW_NEW_ERROR_RETURN_FAILURE(
       isolate, NewReferenceError(MessageTemplate::kNonMethod));
 }
 
-
 RUNTIME_FUNCTION(Runtime_ThrowUnsupportedSuperError) {
   HandleScope scope(isolate);
   DCHECK(args.length() == 0);
   THROW_NEW_ERROR_RETURN_FAILURE(
       isolate, NewReferenceError(MessageTemplate::kUnsupportedSuper));
 }
 
 
 RUNTIME_FUNCTION(Runtime_ThrowConstructorNonCallableError) {
   HandleScope scope(isolate);
@@ skipping 12 matching lines @@
       isolate, NewTypeError(MessageTemplate::kArrayNotSubclassable));
 }
 
 RUNTIME_FUNCTION(Runtime_ThrowStaticPrototypeError) {
   HandleScope scope(isolate);
   DCHECK(args.length() == 0);
   THROW_NEW_ERROR_RETURN_FAILURE(
       isolate, NewTypeError(MessageTemplate::kStaticPrototype));
 }
 
+namespace {
+
+Object* ThrowNotSuperConstructor(Isolate* isolate, Handle<Object> constructor,
+                                 Handle<JSFunction> function) {
+  Handle<Object> super_name;
+  if (constructor->IsJSFunction()) {
+    super_name = handle(Handle<JSFunction>::cast(constructor)->shared()->name(),
+                        isolate);
+  } else if (constructor->IsOddball()) {

[Benedikt Meurer, 2016/12/09 18:30:28]

As far as I can tell, this should always be null if it's an Oddball, which means
there's no prototype at all.

+    super_name =
+        handle(Handle<Oddball>::cast(constructor)->to_string(), isolate);
+  } else {
+    super_name = Object::NoSideEffectsToString(isolate, constructor);
+  }
+  Handle<Object> function_name(function->shared()->name(), isolate);
+  THROW_NEW_ERROR_RETURN_FAILURE(
+      isolate, NewTypeError(MessageTemplate::kNotSuperConstructor, super_name,
+                            function_name));
+}
+
+}  // anonymous namespace

[Benedikt Meurer, 2016/12/09 18:30:28]

Nit: just namespace here.

+
+RUNTIME_FUNCTION(Runtime_ThrowNotSuperConstructor) {
+  HandleScope scope(isolate);
+  DCHECK(args.length() == 2);
+  CONVERT_ARG_HANDLE_CHECKED(Object, constructor, 0);
+  CONVERT_ARG_HANDLE_CHECKED(JSFunction, function, 1);
+  return ThrowNotSuperConstructor(isolate, constructor, function);
+}
+
 RUNTIME_FUNCTION(Runtime_HomeObjectSymbol) {
   DCHECK(args.length() == 0);
   return isolate->heap()->home_object_symbol();
 }
 
 static MaybeHandle<Object> DefineClass(Isolate* isolate,
                                        Handle<Object> super_class,
                                        Handle<JSFunction> constructor,
                                        int start_position, int end_position) {
   Handle<Object> prototype_parent;
@@ skipping 342 matching lines @@
 
   RETURN_RESULT_OR_FAILURE(
       isolate,
       StoreKeyedToSuper(isolate, home_object, receiver, key, value, SLOPPY));
 }
 
 
 RUNTIME_FUNCTION(Runtime_GetSuperConstructor) {
   SealHandleScope shs(isolate);
   DCHECK_EQ(1, args.length());
-  CONVERT_ARG_CHECKED(JSFunction, active_function, 0);
-  return active_function->map()->prototype();
+  CONVERT_ARG_HANDLE_CHECKED(JSFunction, active_function, 0);
+  Object* prototype = active_function->map()->prototype();
+  if (!prototype->IsConstructor()) {
+    return ThrowNotSuperConstructor(
+        isolate, Handle<JSFunction>::cast(handle(prototype, isolate)),
+        active_function);
+  }
+  return prototype;
 }
 
 RUNTIME_FUNCTION(Runtime_NewWithSpread) {
   HandleScope scope(isolate);
   DCHECK_LE(3, args.length());
   CONVERT_ARG_HANDLE_CHECKED(JSReceiver, constructor, 0);
   CONVERT_ARG_HANDLE_CHECKED(Object, new_target, 1);
 
   int constructor_argc = args.length() - 2;
   CONVERT_ARG_HANDLE_CHECKED(Object, spread, args.length() - 1);
@@ skipping 27 matching lines @@
   }
 
   // Call the constructor.
   RETURN_RESULT_OR_FAILURE(
       isolate, Execution::New(isolate, constructor, new_target, result_length,
                               construct_args.start()));
 }
 
 }  // namespace internal
 }  // namespace v8