1 files changed, 35 insertions, 0 deletions
diff --git a/js/src/tests/test262/language/statements/class/subclass/class-definition-null-proto-contains-return-override.js b/js/src/tests/test262/language/statements/class/subclass/class-definition-null-proto-contains-return-override.js
new file mode 100644
index 0000000000..5fc6aa0c29
--- /dev/null
+++ b/js/src/tests/test262/language/statements/class/subclass/class-definition-null-proto-contains-return-override.js
@@ -0,0 +1,35 @@
+// Copyright (C) 2014 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+esid: sec-runtime-semantics-classdefinitionevaluation
+es6id: 14.5.14
+description: >
+    The constructor of a null-extending class can contain an explicit return value.
+info: |
+  Runtime Semantics: ClassDefinitionEvaluation
+
+  [...]
+  15. If ClassHeritageopt is present, then set F's [[ConstructorKind]] internal slot to "derived".
+  [...]
+
+  9.2.2 [[Construct]]
+
+  [...]
+  13. If result.[[Type]] is return, then
+     a. If Type(result.[[Value]]) is Object, return NormalCompletion(result.[[Value]]).
+  [...]
+---*/
+var obj;
+
+class Foo extends null {
+  constructor() {
+    return obj = {};
+  }
+}
+
+var f = new Foo();
+
+assert.sameValue(f, obj);
+assert.sameValue(Object.getPrototypeOf(f), Object.prototype);
+
+reportCompare(0, 0);