Index: src/ia32/builtins-ia32.cc |
diff --git a/src/ia32/builtins-ia32.cc b/src/ia32/builtins-ia32.cc |
index 832a9b3c34753b6053f4483eed07ac74b97a3c6a..70b2ad16d36e4498506648b6f1a8c17c4f5aa14e 100644 |
--- a/src/ia32/builtins-ia32.cc |
+++ b/src/ia32/builtins-ia32.cc |
@@ -1506,32 +1506,19 @@ |
// -- eax : the number of arguments (not including the receiver) |
// -- edi : the function to call (checked to be a JSFunction) |
// ----------------------------------- |
- // See ES6 section 9.2.1 [[Call]] ( thisArgument, argumentsList) |
Label convert, convert_global_proxy, convert_to_object, done_convert; |
__ AssertFunction(edi); |
- __ mov(edx, FieldOperand(edi, JSFunction::kSharedFunctionInfoOffset)); |
- |
- { |
- Label non_class_constructor; |
- // Check whether the current function is a classConstructor. |
- __ test_b(FieldOperand(edx, SharedFunctionInfo::kFunctionKindByteOffset), |
- SharedFunctionInfo::kClassConstructorBitsWithinByte); |
- __ j(zero, &non_class_constructor, Label::kNear); |
- // Step: 2, If we call a classConstructor Function throw a TypeError. |
- { |
- FrameScope frame(masm, StackFrame::INTERNAL); |
- __ CallRuntime(Runtime::kThrowConstructorNonCallableError, 0); |
- } |
- __ bind(&non_class_constructor); |
- } |
- |
+ // TODO(bmeurer): Throw a TypeError if function's [[FunctionKind]] internal |
+ // slot is "classConstructor". |
// Enter the context of the function; ToObject has to run in the function |
// context, and we also need to take the global proxy from the function |
// context in case of conversion. |
+ // See ES6 section 9.2.1 [[Call]] ( thisArgument, argumentsList) |
STATIC_ASSERT(SharedFunctionInfo::kNativeByteOffset == |
SharedFunctionInfo::kStrictModeByteOffset); |
__ mov(esi, FieldOperand(edi, JSFunction::kContextOffset)); |
+ __ mov(edx, FieldOperand(edi, JSFunction::kSharedFunctionInfoOffset)); |
// We need to convert the receiver for non-native sloppy mode functions. |
__ test_b(FieldOperand(edx, SharedFunctionInfo::kNativeByteOffset), |
(1 << SharedFunctionInfo::kNativeBitWithinByte) | |