From 545e470e52f0ac6a3a072bf559c796b42c6066b6 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Tue, 15 Jun 2010 19:36:43 +0100 Subject: Merge webkit.org at r61121: Initial merge by git. Change-Id: Icd6db395c62285be384d137164d95d7466c98760 --- JavaScriptCore/runtime/JSFunction.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'JavaScriptCore/runtime/JSFunction.cpp') diff --git a/JavaScriptCore/runtime/JSFunction.cpp b/JavaScriptCore/runtime/JSFunction.cpp index f44ca2f..7fcd037 100644 --- a/JavaScriptCore/runtime/JSFunction.cpp +++ b/JavaScriptCore/runtime/JSFunction.cpp @@ -43,12 +43,11 @@ using namespace Unicode; namespace JSC { -JSValue JSC_HOST_CALL callHostFunctionAsConstructor(ExecState* exec) +EncodedJSValue JSC_HOST_CALL callHostFunctionAsConstructor(ExecState* exec) { CodeBlock* codeBlock = exec->callerFrame()->codeBlock(); unsigned vPCIndex = codeBlock->bytecodeOffset(exec, exec->returnPC()); - exec->setException(createNotAConstructorError(exec, exec->callee(), vPCIndex, codeBlock)); - return JSValue(); + return throwVMError(exec, createNotAConstructorError(exec, exec->callee(), vPCIndex, codeBlock)); } ASSERT_CLASS_FITS_IN_CELL(JSFunction); -- cgit v1.1