<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[163960] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/163960">163960</a></dd>
<dt>Author</dt> <dd>oliver@apple.com</dd>
<dt>Date</dt> <dd>2014-02-12 09:14:23 -0800 (Wed, 12 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make it possible to implement JS builtins in JS
https://bugs.webkit.org/show_bug.cgi?id=127887
Reviewed by Michael Saboff.
.:
* GNUmakefile.am:
* Source/cmake/gtest/CMakeLists.txt:
Source/JavaScriptCore:
This patch makes it possible to write builtin functions in JS.
The bindings, generators, and definitions are all created automatically
based on js files in the builtins/ directory. This patch includes one
such case: Array.prototype.js with an implementation of every().
There's a lot of refactoring to make it possible for CommonIdentifiers
to include the output of the generated files (DerivedSources/JSCBuiltins.{h,cpp})
without breaking the offset extractor. The result of this refactoring
is that CommonIdentifiers, and a few other miscellaneous headers now
need to be included directly as they were formerly captured through other
paths.
In addition this adds a flag to the Lookup table's hashentry to indicate
that a static function is actually backed by JS. There is then a lot of
logic to thread the special nature of the functon to where it matters.
This allows toString(), .caller, etc to mimic the behaviour of a host
function.
Notes on writing builtins:
- Each function is compiled independently of the others, and those
implementations cannot currently capture all global properties (as
that could be potentially unsafe). If a function does capture a
global we will deliberately crash.
- For those "global" properties that we do want access to, we use
the @ prefix, e.g. Object(this) becomes @Object(this). The @ identifiers
are private names, and behave just like regular properties, only
without the risk of adulteration. Again, in the @Object case, we
explicitly duplicate the ObjectConstructor reference on the GlobalObject
so that we have guaranteed access to the original version of the
constructor.
- call, apply, eval, and Function are all rejected identifiers, again
to prevent anything from accidentally using an adulterated object.
Instead @call and @apply are available, and happily they completely
drop the neq_ptr instruction as they're defined as always being the
original call/apply functions.
These restrictions are just intended to make it harder to accidentally
make changes that are incorrect (for instance calling whatever has been
assigned to global.Object, instead of the original constructor function).
However, making a mistake like this should result in a purely semantic
error as fundamentally these functions are treated as though they were
regular JS code in the host global, and have no more privileges than
any other JS.
The initial proof of concept is Array.prototype.every, this shows a 65%
performance improvement, and that improvement is significantly hurt by
our poor optimisation of op_in.
As this is such a limited function, we have not yet exported all symbols
that we could possibly need, but as we implement more, the likelihood
of encountering missing features will reduce.
* API/JSCallbackObjectFunctions.h:
(JSC::JSCallbackObject<Parent>::getOwnPropertySlot):
(JSC::JSCallbackObject<Parent>::put):
(JSC::JSCallbackObject<Parent>::deleteProperty):
(JSC::JSCallbackObject<Parent>::getStaticValue):
(JSC::JSCallbackObject<Parent>::staticFunctionGetter):
(JSC::JSCallbackObject<Parent>::callbackGetter):
* CMakeLists.txt:
* DerivedSources.make:
* GNUmakefile.am:
* GNUmakefile.list.am:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
* JavaScriptCore.vcxproj/JavaScriptCoreCommon.props:
* JavaScriptCore.vcxproj/copy-files.cmd:
* JavaScriptCore.xcodeproj/project.pbxproj:
* builtins/Array.prototype.js:
(every):
* builtins/BuiltinExecutables.cpp: Added.
(JSC::BuiltinExecutables::BuiltinExecutables):
(JSC::BuiltinExecutables::createBuiltinExecutable):
* builtins/BuiltinExecutables.h:
(JSC::BuiltinExecutables::create):
* builtins/BuiltinNames.h: Added.
(JSC::BuiltinNames::BuiltinNames):
(JSC::BuiltinNames::getPrivateName):
(JSC::BuiltinNames::getPublicName):
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::CodeBlock):
* bytecode/UnlinkedCodeBlock.cpp:
(JSC::generateFunctionCodeBlock):
(JSC::UnlinkedFunctionExecutable::UnlinkedFunctionExecutable):
(JSC::UnlinkedFunctionExecutable::codeBlockFor):
(JSC::UnlinkedCodeBlock::UnlinkedCodeBlock):
* bytecode/UnlinkedCodeBlock.h:
(JSC::ExecutableInfo::ExecutableInfo):
(JSC::UnlinkedFunctionExecutable::create):
(JSC::UnlinkedFunctionExecutable::toStrictness):
(JSC::UnlinkedFunctionExecutable::isBuiltinFunction):
(JSC::UnlinkedCodeBlock::isBuiltinFunction):
* bytecompiler/BytecodeGenerator.cpp:
(JSC::BytecodeGenerator::BytecodeGenerator):
* bytecompiler/BytecodeGenerator.h:
(JSC::BytecodeGenerator::isBuiltinFunction):
(JSC::BytecodeGenerator::makeFunction):
* bytecompiler/NodesCodegen.cpp:
(JSC::CallFunctionCallDotNode::emitBytecode):
(JSC::ApplyFunctionCallDotNode::emitBytecode):
* create_hash_table:
* generate-js-builtins: Added.
(getCopyright):
(getFunctions):
(generateCode):
(mangleName):
(FunctionExecutable):
(Identifier):
(JSGlobalObject):
(SourceCode):
(UnlinkedFunctionExecutable):
(VM):
* interpreter/CachedCall.h:
(JSC::CachedCall::CachedCall):
* parser/ASTBuilder.h:
(JSC::ASTBuilder::makeFunctionCallNode):
* parser/Lexer.cpp:
(JSC::Lexer<T>::Lexer):
(JSC::isSafeBuiltinIdentifier):
(JSC::Lexer<LChar>::parseIdentifier):
(JSC::Lexer<UChar>::parseIdentifier):
(JSC::Lexer<T>::lex):
* parser/Lexer.h:
(JSC::isSafeIdentifier):
(JSC::Lexer<T>::lexExpectIdentifier):
* parser/Nodes.cpp:
(JSC::ProgramNode::setClosedVariables):
* parser/Nodes.h:
(JSC::ScopeNode::capturedVariables):
(JSC::ScopeNode::setClosedVariables):
(JSC::ProgramNode::closedVariables):
* parser/Parser.cpp:
(JSC::Parser<LexerType>::Parser):
(JSC::Parser<LexerType>::parseInner):
(JSC::Parser<LexerType>::didFinishParsing):
(JSC::Parser<LexerType>::printUnexpectedTokenText):
* parser/Parser.h:
(JSC::Scope::getUsedVariables):
(JSC::Parser::closedVariables):
(JSC::parse):
* parser/ParserModes.h:
* parser/ParserTokens.h:
* runtime/ArrayPrototype.cpp:
* runtime/CodeCache.cpp:
(JSC::CodeCache::getFunctionExecutableFromGlobalCode):
* runtime/CommonIdentifiers.cpp:
(JSC::CommonIdentifiers::CommonIdentifiers):
(JSC::CommonIdentifiers::~CommonIdentifiers):
(JSC::CommonIdentifiers::getPrivateName):
(JSC::CommonIdentifiers::getPublicName):
* runtime/CommonIdentifiers.h:
(JSC::CommonIdentifiers::builtinNames):
* runtime/ExceptionHelpers.cpp:
(JSC::createUndefinedVariableError):
* runtime/Executable.h:
(JSC::EvalExecutable::executableInfo):
(JSC::ProgramExecutable::executableInfo):
(JSC::FunctionExecutable::isBuiltinFunction):
* runtime/FunctionPrototype.cpp:
(JSC::functionProtoFuncToString):
* runtime/JSActivation.cpp:
(JSC::JSActivation::symbolTableGet):
(JSC::JSActivation::symbolTablePut):
(JSC::JSActivation::symbolTablePutWithAttributes):
* runtime/JSFunction.cpp:
(JSC::JSFunction::createBuiltinFunction):
(JSC::JSFunction::calculatedDisplayName):
(JSC::JSFunction::sourceCode):
(JSC::JSFunction::isHostOrBuiltinFunction):
(JSC::JSFunction::isBuiltinFunction):
(JSC::JSFunction::callerGetter):
(JSC::JSFunction::getOwnPropertySlot):
(JSC::JSFunction::getOwnNonIndexPropertyNames):
(JSC::JSFunction::put):
(JSC::JSFunction::defineOwnProperty):
* runtime/JSFunction.h:
* runtime/JSFunctionInlines.h:
(JSC::JSFunction::nativeFunction):
(JSC::JSFunction::nativeConstructor):
(JSC::isHostFunction):
* runtime/JSGlobalObject.cpp:
(JSC::JSGlobalObject::reset):
(JSC::JSGlobalObject::visitChildren):
* runtime/JSGlobalObject.h:
(JSC::JSGlobalObject::objectConstructor):
(JSC::JSGlobalObject::symbolTableHasProperty):
* runtime/JSObject.cpp:
(JSC::getClassPropertyNames):
(JSC::JSObject::reifyStaticFunctionsForDelete):
(JSC::JSObject::putDirectBuiltinFunction):
* runtime/JSObject.h:
* runtime/JSSymbolTableObject.cpp:
(JSC::JSSymbolTableObject::getOwnNonIndexPropertyNames):
* runtime/JSSymbolTableObject.h:
(JSC::symbolTableGet):
(JSC::symbolTablePut):
(JSC::symbolTablePutWithAttributes):
* runtime/Lookup.cpp:
(JSC::setUpStaticFunctionSlot):
* runtime/Lookup.h:
(JSC::HashEntry::builtinGenerator):
(JSC::HashEntry::propertyGetter):
(JSC::HashEntry::propertyPutter):
(JSC::HashTable::entry):
(JSC::getStaticPropertySlot):
(JSC::getStaticValueSlot):
(JSC::putEntry):
* runtime/NativeErrorConstructor.cpp:
(JSC::NativeErrorConstructor::finishCreation):
* runtime/NativeErrorConstructor.h:
* runtime/PropertySlot.h:
* runtime/VM.cpp:
(JSC::VM::VM):
* runtime/VM.h:
(JSC::VM::builtinExecutables):
Tools:
CMake updates
* DumpRenderTree/CMakeLists.txt:
* WebKitTestRunner/CMakeLists.txt:
* WinCELauncher/CMakeLists.txt:
LayoutTests:
Updated the test results for new error messages (now that they're
actually helpful), and added a js-regress test to track performance.
* js/array-every-expected.txt:
* js/dom/array-prototype-properties-expected.txt:
* js/regress/array-prototype-every-expected.txt: Added.
* js/regress/array-prototype-every.html: Added.
* js/regress/script-tests/array-prototype-every.js: Added.
(test1):
(test2):
(test3):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkGNUmakefileam">trunk/GNUmakefile.am</a></li>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsjsarrayeveryexpectedtxt">trunk/LayoutTests/js/array-every-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsdomarrayprototypepropertiesexpectedtxt">trunk/LayoutTests/js/dom/array-prototype-properties-expected.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreAPIJSCallbackObjectFunctionsh">trunk/Source/JavaScriptCore/API/JSCallbackObjectFunctions.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreCMakeListstxt">trunk/Source/JavaScriptCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreDerivedSourcesmake">trunk/Source/JavaScriptCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceJavaScriptCoreGNUmakefileam">trunk/Source/JavaScriptCore/GNUmakefile.am</a></li>
<li><a href="#trunkSourceJavaScriptCoreGNUmakefilelistam">trunk/Source/JavaScriptCore/GNUmakefile.list.am</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCoreCommonprops">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreCommon.props</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojcopyfilescmd">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/copy-files.cmd</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj">trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeCodeBlockcpp">trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockcpp">trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockh">trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp">trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorh">trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerNodesCodegencpp">trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorecreate_hash_table">trunk/Source/JavaScriptCore/create_hash_table</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterCachedCallh">trunk/Source/JavaScriptCore/interpreter/CachedCall.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserASTBuilderh">trunk/Source/JavaScriptCore/parser/ASTBuilder.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserLexercpp">trunk/Source/JavaScriptCore/parser/Lexer.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserLexerh">trunk/Source/JavaScriptCore/parser/Lexer.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserNodescpp">trunk/Source/JavaScriptCore/parser/Nodes.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserNodesh">trunk/Source/JavaScriptCore/parser/Nodes.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserParsercpp">trunk/Source/JavaScriptCore/parser/Parser.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserParserh">trunk/Source/JavaScriptCore/parser/Parser.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserParserModesh">trunk/Source/JavaScriptCore/parser/ParserModes.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserParserTokensh">trunk/Source/JavaScriptCore/parser/ParserTokens.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeArrayPrototypecpp">trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCodeCachecpp">trunk/Source/JavaScriptCore/runtime/CodeCache.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCommonIdentifierscpp">trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCommonIdentifiersh">trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeExceptionHelperscpp">trunk/Source/JavaScriptCore/runtime/ExceptionHelpers.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeExecutableh">trunk/Source/JavaScriptCore/runtime/Executable.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeFunctionPrototypecpp">trunk/Source/JavaScriptCore/runtime/FunctionPrototype.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSActivationcpp">trunk/Source/JavaScriptCore/runtime/JSActivation.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSFunctioncpp">trunk/Source/JavaScriptCore/runtime/JSFunction.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSFunctionh">trunk/Source/JavaScriptCore/runtime/JSFunction.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSFunctionInlinesh">trunk/Source/JavaScriptCore/runtime/JSFunctionInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjectcpp">trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjecth">trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSObjectcpp">trunk/Source/JavaScriptCore/runtime/JSObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSObjecth">trunk/Source/JavaScriptCore/runtime/JSObject.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSSymbolTableObjectcpp">trunk/Source/JavaScriptCore/runtime/JSSymbolTableObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSSymbolTableObjecth">trunk/Source/JavaScriptCore/runtime/JSSymbolTableObject.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeLookupcpp">trunk/Source/JavaScriptCore/runtime/Lookup.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeLookuph">trunk/Source/JavaScriptCore/runtime/Lookup.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeNativeErrorConstructorcpp">trunk/Source/JavaScriptCore/runtime/NativeErrorConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeNativeErrorConstructorh">trunk/Source/JavaScriptCore/runtime/NativeErrorConstructor.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimePropertySloth">trunk/Source/JavaScriptCore/runtime/PropertySlot.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeVMcpp">trunk/Source/JavaScriptCore/runtime/VM.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeVMh">trunk/Source/JavaScriptCore/runtime/VM.h</a></li>
<li><a href="#trunkSourcecmakegtestCMakeListstxt">trunk/Source/cmake/gtest/CMakeLists.txt</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeCMakeListstxt">trunk/Tools/DumpRenderTree/CMakeLists.txt</a></li>
<li><a href="#trunkToolsWebKitTestRunnerCMakeListstxt">trunk/Tools/WebKitTestRunner/CMakeLists.txt</a></li>
<li><a href="#trunkToolsWinCELauncherCMakeListstxt">trunk/Tools/WinCELauncher/CMakeLists.txt</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsjsregressarrayprototypeeveryexpectedtxt">trunk/LayoutTests/js/regress/array-prototype-every-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsregressarrayprototypeeveryhtml">trunk/LayoutTests/js/regress/array-prototype-every.html</a></li>
<li><a href="#trunkLayoutTestsjsregressscripttestsarrayprototypeeveryjs">trunk/LayoutTests/js/regress/script-tests/array-prototype-every.js</a></li>
<li><a href="#trunkSourceJavaScriptCorebuiltinsArrayprototypejs">trunk/Source/JavaScriptCore/builtins/Array.prototype.js</a></li>
<li><a href="#trunkSourceJavaScriptCorebuiltinsBuiltinExecutablescpp">trunk/Source/JavaScriptCore/builtins/BuiltinExecutables.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebuiltinsBuiltinExecutablesh">trunk/Source/JavaScriptCore/builtins/BuiltinExecutables.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebuiltinsBuiltinNamesh">trunk/Source/JavaScriptCore/builtins/BuiltinNames.h</a></li>
<li><a href="#trunkSourceJavaScriptCoregeneratejsbuiltins">trunk/Source/JavaScriptCore/generate-js-builtins</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/ChangeLog 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-02-11 Oliver Hunt <oliver@apple.com>
+
+ Make it possible to implement JS builtins in JS
+ https://bugs.webkit.org/show_bug.cgi?id=127887
+
+ Reviewed by Michael Saboff.
+
+ * GNUmakefile.am:
+ * Source/cmake/gtest/CMakeLists.txt:
+
</ins><span class="cx"> 2014-02-12 Ryan Lortie <desrt@desrt.ca>
</span><span class="cx">
</span><span class="cx"> 'ar T' is not portable and breaks the build on FreeBSD
</span></span></pre></div>
<a id="trunkGNUmakefileam"></a>
<div class="modfile"><h4>Modified: trunk/GNUmakefile.am (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/GNUmakefile.am 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/GNUmakefile.am 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -68,6 +68,7 @@
</span><span class="cx"> dom_binding_idls :=
</span><span class="cx"> wtf_sources :=
</span><span class="cx"> javascriptcore_h_api :=
</span><ins>+javascriptcore_builtins_js_nosources :=
</ins><span class="cx"> javascriptcore_cppflags:=
</span><span class="cx"> javascriptcore_cflags :=
</span><span class="cx"> javascriptcore_sources :=
</span></span></pre></div>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/LayoutTests/ChangeLog 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-02-11 Oliver Hunt <oliver@apple.com>
+
+ Make it possible to implement JS builtins in JS
+ https://bugs.webkit.org/show_bug.cgi?id=127887
+
+ Reviewed by Michael Saboff.
+
+ Updated the test results for new error messages (now that they're
+ actually helpful), and added a js-regress test to track performance.
+
+ * js/array-every-expected.txt:
+ * js/dom/array-prototype-properties-expected.txt:
+ * js/regress/array-prototype-every-expected.txt: Added.
+ * js/regress/array-prototype-every.html: Added.
+ * js/regress/script-tests/array-prototype-every.js: Added.
+ (test1):
+ (test2):
+ (test3):
+
</ins><span class="cx"> 2014-02-12 Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
</span><span class="cx">
</span><span class="cx"> Update the HTML Media Capture implementation.
</span></span></pre></div>
<a id="trunkLayoutTestsjsarrayeveryexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/array-every-expected.txt (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/array-every-expected.txt 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/LayoutTests/js/array-every-expected.txt 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -30,12 +30,12 @@
</span><span class="cx"> PASS [12, 54, 18, 130, 44].every(isBigEnoughAndException) threw exception exception from function.
</span><span class="cx">
</span><span class="cx"> 5.0 Wrong Type for Callback Test
</span><del>-PASS [12, 5, 8, 130, 44].every(5) threw exception TypeError: Type error.
-PASS [12, 5, 8, 130, 44].every('wrong') threw exception TypeError: Type error.
-PASS [12, 5, 8, 130, 44].every(new Object()) threw exception TypeError: Type error.
-PASS [12, 5, 8, 130, 44].every(null) threw exception TypeError: Type error.
-PASS [12, 5, 8, 130, 44].every(undefined) threw exception TypeError: Type error.
-PASS [12, 5, 8, 130, 44].every() threw exception TypeError: Type error.
</del><ins>+PASS [12, 5, 8, 130, 44].every(5) threw exception TypeError: Array.prototype.every callback must be a function.
+PASS [12, 5, 8, 130, 44].every('wrong') threw exception TypeError: Array.prototype.every callback must be a function.
+PASS [12, 5, 8, 130, 44].every(new Object()) threw exception TypeError: Array.prototype.every callback must be a function.
+PASS [12, 5, 8, 130, 44].every(null) threw exception TypeError: Array.prototype.every callback must be a function.
+PASS [12, 5, 8, 130, 44].every(undefined) threw exception TypeError: Array.prototype.every callback must be a function.
+PASS [12, 5, 8, 130, 44].every() threw exception TypeError: Array.prototype.every callback must be a function.
</ins><span class="cx">
</span><span class="cx"> 6.0 Early Exit ("Short Circuiting")
</span><span class="cx"> PASS [12, 5, 8, 130, 44].every(isBigEnoughShortCircuit) is false
</span></span></pre></div>
<a id="trunkLayoutTestsjsdomarrayprototypepropertiesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/dom/array-prototype-properties-expected.txt (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/dom/array-prototype-properties-expected.txt 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/LayoutTests/js/dom/array-prototype-properties-expected.txt 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> PASS Array.prototype.sort.call(undefined) threw exception TypeError: undefined is not an object (evaluating 'Array.prototype.sort.call(undefined)').
</span><span class="cx"> PASS Array.prototype.splice.call(undefined, 0, 1) threw exception TypeError: undefined is not an object (evaluating 'Array.prototype.splice.call(undefined, 0, 1)').
</span><span class="cx"> PASS Array.prototype.unshift.call(undefined, {}) threw exception TypeError: undefined is not an object (evaluating 'Array.prototype.unshift.call(undefined, {})').
</span><del>-PASS Array.prototype.every.call(undefined, toString) threw exception TypeError: undefined is not an object (evaluating 'Array.prototype.every.call(undefined, toString)').
</del><ins>+PASS Array.prototype.every.call(undefined, toString) threw exception TypeError: Array.prototype.every requires that |this| not be undefined.
</ins><span class="cx"> PASS Array.prototype.forEach.call(undefined, toString) threw exception TypeError: undefined is not an object (evaluating 'Array.prototype.forEach.call(undefined, toString)').
</span><span class="cx"> PASS Array.prototype.some.call(undefined, toString) threw exception TypeError: undefined is not an object (evaluating 'Array.prototype.some.call(undefined, toString)').
</span><span class="cx"> PASS Array.prototype.indexOf.call(undefined, 0) threw exception TypeError: undefined is not an object (evaluating 'Array.prototype.indexOf.call(undefined, 0)').
</span></span></pre></div>
<a id="trunkLayoutTestsjsregressarrayprototypeeveryexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/array-prototype-every-expected.txt (0 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/array-prototype-every-expected.txt (rev 0)
+++ trunk/LayoutTests/js/regress/array-prototype-every-expected.txt 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+JSRegress/array-prototype-every
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS no exception thrown
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregressarrayprototypeeveryhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/array-prototype-every.html (0 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/array-prototype-every.html (rev 0)
+++ trunk/LayoutTests/js/regress/array-prototype-every.html 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script src="resources/regress-pre.js"></script>
+<script src="script-tests/array-prototype-every.js"></script>
+<script src="resources/regress-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregressscripttestsarrayprototypeeveryjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/script-tests/array-prototype-every.js (0 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/script-tests/array-prototype-every.js (rev 0)
+++ trunk/LayoutTests/js/regress/script-tests/array-prototype-every.js 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+var result = 0;
+function test1(a) {
+ result << 1;
+ result++;
+ return true;
+}
+function test2(a,b) {
+ result ^= 3;
+ result *= 3;
+ return true;
+}
+function test3(a,b,c) {
+ result ^= result >> 1;
+ return true;
+}
+
+var result = 0;
+var array = []
+for (var i = 0; i < 100000; ++i)
+ array[i] = 1;
+
+for (var i = 0; i < 10; i++) {
+ array.every(test1);
+ array.every(test2);
+ array.every(test3);
+}
+
+if (result != 1428810496)
+ throw "Error: bad result: " + result;
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreAPIJSCallbackObjectFunctionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/JSCallbackObjectFunctions.h (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/JSCallbackObjectFunctions.h 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/API/JSCallbackObjectFunctions.h 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> JSObjectRef thisRef = toRef(thisObject);
</span><span class="cx"> RefPtr<OpaqueJSString> propertyNameRef;
</span><span class="cx">
</span><del>- if (StringImpl* name = propertyName.publicName()) {
</del><ins>+ if (StringImpl* name = propertyName.uid()) {
</ins><span class="cx"> for (JSClassRef jsClass = thisObject->classRef(); jsClass; jsClass = jsClass->parentClass) {
</span><span class="cx"> // optional optimization to bypass getProperty in cases when we only need to know if the property exists
</span><span class="cx"> if (JSObjectHasPropertyCallback hasProperty = jsClass->hasProperty) {
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx"> RefPtr<OpaqueJSString> propertyNameRef;
</span><span class="cx"> JSValueRef valueRef = toRef(exec, value);
</span><span class="cx">
</span><del>- if (StringImpl* name = propertyName.publicName()) {
</del><ins>+ if (StringImpl* name = propertyName.uid()) {
</ins><span class="cx"> for (JSClassRef jsClass = thisObject->classRef(); jsClass; jsClass = jsClass->parentClass) {
</span><span class="cx"> if (JSObjectSetPropertyCallback setProperty = jsClass->setProperty) {
</span><span class="cx"> if (!propertyNameRef)
</span><span class="lines">@@ -343,7 +343,7 @@
</span><span class="cx"> JSObjectRef thisRef = toRef(thisObject);
</span><span class="cx"> RefPtr<OpaqueJSString> propertyNameRef;
</span><span class="cx">
</span><del>- if (StringImpl* name = propertyName.publicName()) {
</del><ins>+ if (StringImpl* name = propertyName.uid()) {
</ins><span class="cx"> for (JSClassRef jsClass = thisObject->classRef(); jsClass; jsClass = jsClass->parentClass) {
</span><span class="cx"> if (JSObjectDeletePropertyCallback deleteProperty = jsClass->deleteProperty) {
</span><span class="cx"> if (!propertyNameRef)
</span><span class="lines">@@ -564,7 +564,7 @@
</span><span class="cx"> {
</span><span class="cx"> JSObjectRef thisRef = toRef(this);
</span><span class="cx">
</span><del>- if (StringImpl* name = propertyName.publicName()) {
</del><ins>+ if (StringImpl* name = propertyName.uid()) {
</ins><span class="cx"> for (JSClassRef jsClass = classRef(); jsClass; jsClass = jsClass->parentClass) {
</span><span class="cx"> if (OpaqueJSClassStaticValuesTable* staticValues = jsClass->staticValues(exec)) {
</span><span class="cx"> if (StaticValueEntry* entry = staticValues->get(name)) {
</span><span class="lines">@@ -600,7 +600,7 @@
</span><span class="cx"> if (Parent::getOwnPropertySlot(thisObj, exec, propertyName, slot2))
</span><span class="cx"> return JSValue::encode(slot2.getValue(exec, propertyName));
</span><span class="cx">
</span><del>- if (StringImpl* name = propertyName.publicName()) {
</del><ins>+ if (StringImpl* name = propertyName.uid()) {
</ins><span class="cx"> for (JSClassRef jsClass = thisObj->classRef(); jsClass; jsClass = jsClass->parentClass) {
</span><span class="cx"> if (OpaqueJSClassStaticFunctionsTable* staticFunctions = jsClass->staticFunctions(exec)) {
</span><span class="cx"> if (StaticFunctionEntry* entry = staticFunctions->get(name)) {
</span><span class="lines">@@ -626,7 +626,7 @@
</span><span class="cx"> JSObjectRef thisRef = toRef(thisObj);
</span><span class="cx"> RefPtr<OpaqueJSString> propertyNameRef;
</span><span class="cx">
</span><del>- if (StringImpl* name = propertyName.publicName()) {
</del><ins>+ if (StringImpl* name = propertyName.uid()) {
</ins><span class="cx"> for (JSClassRef jsClass = thisObj->classRef(); jsClass; jsClass = jsClass->parentClass) {
</span><span class="cx"> if (JSObjectGetPropertyCallback getProperty = jsClass->getProperty) {
</span><span class="cx"> if (!propertyNameRef)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -5,6 +5,7 @@
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}/ForwardingHeaders"
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}/assembler"
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}/bindings"
</span><ins>+ "${JAVASCRIPTCORE_DIR}/builtins"
</ins><span class="cx"> "${JAVASCRIPTCORE_DIR}/bytecode"
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}/bytecompiler"
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}/dfg"
</span><span class="lines">@@ -52,6 +53,8 @@
</span><span class="cx"> bindings/ScriptObject.cpp
</span><span class="cx"> bindings/ScriptValue.cpp
</span><span class="cx">
</span><ins>+ builtins/BuiltinExecutables.cpp
+
</ins><span class="cx"> bytecode/ArrayAllocationProfile.cpp
</span><span class="cx"> bytecode/ArrayProfile.cpp
</span><span class="cx"> bytecode/BytecodeBasicBlock.cpp
</span><span class="lines">@@ -719,7 +722,7 @@
</span><span class="cx"> macro(GENERATE_HASH_LUT _input _output)
</span><span class="cx"> add_custom_command(
</span><span class="cx"> OUTPUT ${_output}
</span><del>- DEPENDS ${HASH_LUT_GENERATOR} ${_input}
</del><ins>+ DEPENDS ${HASH_LUT_GENERATOR} ${_input} ${CMAKE_CURRENT_SOURCE_DIR}/generate-js-builtins
</ins><span class="cx"> COMMAND ${PERL_EXECUTABLE} ${HASH_LUT_GENERATOR} ${_input} -i > ${_output}
</span><span class="cx"> VERBATIM)
</span><span class="cx"> list(APPEND JavaScriptCore_HEADERS ${_output})
</span><span class="lines">@@ -748,6 +751,7 @@
</span><span class="cx"> yarr
</span><span class="cx">
</span><span class="cx"> collector/handles
</span><ins>+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> set(JavaScriptCore_FORWARDING_HEADERS_FILES
</span><span class="lines">@@ -775,8 +779,11 @@
</span><span class="cx"> assembler/LinkBuffer.h
</span><span class="cx"> assembler/MacroAssembler.h
</span><span class="cx"> assembler/MacroAssemblerCodeRef.h
</span><ins>+ assembler/MacroAssemblerCodeRef.h
</ins><span class="cx"> jit/GPRInfo.h
</span><span class="cx"> runtime/VM.h
</span><ins>+
+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSCBuiltins.h
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -828,16 +835,27 @@
</span><span class="cx"> COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/CodeGeneratorInspector.py ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJS.json --output_h_dir "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}" --output_cpp_dir "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}" --output_js_dir "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}" --output_type JavaScript --write_always && mkdir -p ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector && cp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSBackendDispatchers.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSFrontendDispatchers.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSTypeBuilders.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector
</span><span class="cx"> VERBATIM)
</span><span class="cx">
</span><ins>+# JSCBuiltins
+file(GLOB JSCBuiltins_js_files "${CMAKE_CURRENT_SOURCE_DIR}/builtins/*.js")
+add_custom_command(
+ OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSCBuiltins.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSCBuiltins.h
+ MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/generate-js-builtins
+ DEPENDS ${JSCBuiltins_js_files}
+ COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/generate-js-builtins ${JSCBuiltins_js_files} ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSCBuiltins.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSCBuiltins.cpp
+ VERBATIM)
+
</ins><span class="cx"> list(APPEND JavaScriptCore_SOURCES
</span><span class="cx"> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSBackendDispatchers.cpp
</span><span class="cx"> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSFrontendDispatchers.cpp
</span><span class="cx"> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSTypeBuilders.cpp
</span><ins>+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSCBuiltins.cpp
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND JavaScriptCore_HEADERS
</span><span class="cx"> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSBackendDispatchers.h
</span><span class="cx"> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSFrontendDispatchers.h
</span><span class="cx"> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSTypeBuilders.h
</span><ins>+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSCBuiltins.h
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> add_custom_command(
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -1,3 +1,227 @@
</span><ins>+2014-02-11 Oliver Hunt <oliver@apple.com>
+
+ Make it possible to implement JS builtins in JS
+ https://bugs.webkit.org/show_bug.cgi?id=127887
+
+ Reviewed by Michael Saboff.
+
+ This patch makes it possible to write builtin functions in JS.
+ The bindings, generators, and definitions are all created automatically
+ based on js files in the builtins/ directory. This patch includes one
+ such case: Array.prototype.js with an implementation of every().
+
+ There's a lot of refactoring to make it possible for CommonIdentifiers
+ to include the output of the generated files (DerivedSources/JSCBuiltins.{h,cpp})
+ without breaking the offset extractor. The result of this refactoring
+ is that CommonIdentifiers, and a few other miscellaneous headers now
+ need to be included directly as they were formerly captured through other
+ paths.
+
+ In addition this adds a flag to the Lookup table's hashentry to indicate
+ that a static function is actually backed by JS. There is then a lot of
+ logic to thread the special nature of the functon to where it matters.
+ This allows toString(), .caller, etc to mimic the behaviour of a host
+ function.
+
+ Notes on writing builtins:
+ - Each function is compiled independently of the others, and those
+ implementations cannot currently capture all global properties (as
+ that could be potentially unsafe). If a function does capture a
+ global we will deliberately crash.
+ - For those "global" properties that we do want access to, we use
+ the @ prefix, e.g. Object(this) becomes @Object(this). The @ identifiers
+ are private names, and behave just like regular properties, only
+ without the risk of adulteration. Again, in the @Object case, we
+ explicitly duplicate the ObjectConstructor reference on the GlobalObject
+ so that we have guaranteed access to the original version of the
+ constructor.
+ - call, apply, eval, and Function are all rejected identifiers, again
+ to prevent anything from accidentally using an adulterated object.
+ Instead @call and @apply are available, and happily they completely
+ drop the neq_ptr instruction as they're defined as always being the
+ original call/apply functions.
+
+ These restrictions are just intended to make it harder to accidentally
+ make changes that are incorrect (for instance calling whatever has been
+ assigned to global.Object, instead of the original constructor function).
+ However, making a mistake like this should result in a purely semantic
+ error as fundamentally these functions are treated as though they were
+ regular JS code in the host global, and have no more privileges than
+ any other JS.
+
+ The initial proof of concept is Array.prototype.every, this shows a 65%
+ performance improvement, and that improvement is significantly hurt by
+ our poor optimisation of op_in.
+
+ As this is such a limited function, we have not yet exported all symbols
+ that we could possibly need, but as we implement more, the likelihood
+ of encountering missing features will reduce.
+
+
+ * API/JSCallbackObjectFunctions.h:
+ (JSC::JSCallbackObject<Parent>::getOwnPropertySlot):
+ (JSC::JSCallbackObject<Parent>::put):
+ (JSC::JSCallbackObject<Parent>::deleteProperty):
+ (JSC::JSCallbackObject<Parent>::getStaticValue):
+ (JSC::JSCallbackObject<Parent>::staticFunctionGetter):
+ (JSC::JSCallbackObject<Parent>::callbackGetter):
+ * CMakeLists.txt:
+ * DerivedSources.make:
+ * GNUmakefile.am:
+ * GNUmakefile.list.am:
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
+ * JavaScriptCore.vcxproj/JavaScriptCoreCommon.props:
+ * JavaScriptCore.vcxproj/copy-files.cmd:
+ * JavaScriptCore.xcodeproj/project.pbxproj:
+ * builtins/Array.prototype.js:
+ (every):
+ * builtins/BuiltinExecutables.cpp: Added.
+ (JSC::BuiltinExecutables::BuiltinExecutables):
+ (JSC::BuiltinExecutables::createBuiltinExecutable):
+ * builtins/BuiltinExecutables.h:
+ (JSC::BuiltinExecutables::create):
+ * builtins/BuiltinNames.h: Added.
+ (JSC::BuiltinNames::BuiltinNames):
+ (JSC::BuiltinNames::getPrivateName):
+ (JSC::BuiltinNames::getPublicName):
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::CodeBlock):
+ * bytecode/UnlinkedCodeBlock.cpp:
+ (JSC::generateFunctionCodeBlock):
+ (JSC::UnlinkedFunctionExecutable::UnlinkedFunctionExecutable):
+ (JSC::UnlinkedFunctionExecutable::codeBlockFor):
+ (JSC::UnlinkedCodeBlock::UnlinkedCodeBlock):
+ * bytecode/UnlinkedCodeBlock.h:
+ (JSC::ExecutableInfo::ExecutableInfo):
+ (JSC::UnlinkedFunctionExecutable::create):
+ (JSC::UnlinkedFunctionExecutable::toStrictness):
+ (JSC::UnlinkedFunctionExecutable::isBuiltinFunction):
+ (JSC::UnlinkedCodeBlock::isBuiltinFunction):
+ * bytecompiler/BytecodeGenerator.cpp:
+ (JSC::BytecodeGenerator::BytecodeGenerator):
+ * bytecompiler/BytecodeGenerator.h:
+ (JSC::BytecodeGenerator::isBuiltinFunction):
+ (JSC::BytecodeGenerator::makeFunction):
+ * bytecompiler/NodesCodegen.cpp:
+ (JSC::CallFunctionCallDotNode::emitBytecode):
+ (JSC::ApplyFunctionCallDotNode::emitBytecode):
+ * create_hash_table:
+ * generate-js-builtins: Added.
+ (getCopyright):
+ (getFunctions):
+ (generateCode):
+ (mangleName):
+ (FunctionExecutable):
+ (Identifier):
+ (JSGlobalObject):
+ (SourceCode):
+ (UnlinkedFunctionExecutable):
+ (VM):
+ * interpreter/CachedCall.h:
+ (JSC::CachedCall::CachedCall):
+ * parser/ASTBuilder.h:
+ (JSC::ASTBuilder::makeFunctionCallNode):
+ * parser/Lexer.cpp:
+ (JSC::Lexer<T>::Lexer):
+ (JSC::isSafeBuiltinIdentifier):
+ (JSC::Lexer<LChar>::parseIdentifier):
+ (JSC::Lexer<UChar>::parseIdentifier):
+ (JSC::Lexer<T>::lex):
+ * parser/Lexer.h:
+ (JSC::isSafeIdentifier):
+ (JSC::Lexer<T>::lexExpectIdentifier):
+ * parser/Nodes.cpp:
+ (JSC::ProgramNode::setClosedVariables):
+ * parser/Nodes.h:
+ (JSC::ScopeNode::capturedVariables):
+ (JSC::ScopeNode::setClosedVariables):
+ (JSC::ProgramNode::closedVariables):
+ * parser/Parser.cpp:
+ (JSC::Parser<LexerType>::Parser):
+ (JSC::Parser<LexerType>::parseInner):
+ (JSC::Parser<LexerType>::didFinishParsing):
+ (JSC::Parser<LexerType>::printUnexpectedTokenText):
+ * parser/Parser.h:
+ (JSC::Scope::getUsedVariables):
+ (JSC::Parser::closedVariables):
+ (JSC::parse):
+ * parser/ParserModes.h:
+ * parser/ParserTokens.h:
+ * runtime/ArrayPrototype.cpp:
+ * runtime/CodeCache.cpp:
+ (JSC::CodeCache::getFunctionExecutableFromGlobalCode):
+ * runtime/CommonIdentifiers.cpp:
+ (JSC::CommonIdentifiers::CommonIdentifiers):
+ (JSC::CommonIdentifiers::~CommonIdentifiers):
+ (JSC::CommonIdentifiers::getPrivateName):
+ (JSC::CommonIdentifiers::getPublicName):
+ * runtime/CommonIdentifiers.h:
+ (JSC::CommonIdentifiers::builtinNames):
+ * runtime/ExceptionHelpers.cpp:
+ (JSC::createUndefinedVariableError):
+ * runtime/Executable.h:
+ (JSC::EvalExecutable::executableInfo):
+ (JSC::ProgramExecutable::executableInfo):
+ (JSC::FunctionExecutable::isBuiltinFunction):
+ * runtime/FunctionPrototype.cpp:
+ (JSC::functionProtoFuncToString):
+ * runtime/JSActivation.cpp:
+ (JSC::JSActivation::symbolTableGet):
+ (JSC::JSActivation::symbolTablePut):
+ (JSC::JSActivation::symbolTablePutWithAttributes):
+ * runtime/JSFunction.cpp:
+ (JSC::JSFunction::createBuiltinFunction):
+ (JSC::JSFunction::calculatedDisplayName):
+ (JSC::JSFunction::sourceCode):
+ (JSC::JSFunction::isHostOrBuiltinFunction):
+ (JSC::JSFunction::isBuiltinFunction):
+ (JSC::JSFunction::callerGetter):
+ (JSC::JSFunction::getOwnPropertySlot):
+ (JSC::JSFunction::getOwnNonIndexPropertyNames):
+ (JSC::JSFunction::put):
+ (JSC::JSFunction::defineOwnProperty):
+ * runtime/JSFunction.h:
+ * runtime/JSFunctionInlines.h:
+ (JSC::JSFunction::nativeFunction):
+ (JSC::JSFunction::nativeConstructor):
+ (JSC::isHostFunction):
+ * runtime/JSGlobalObject.cpp:
+ (JSC::JSGlobalObject::reset):
+ (JSC::JSGlobalObject::visitChildren):
+ * runtime/JSGlobalObject.h:
+ (JSC::JSGlobalObject::objectConstructor):
+ (JSC::JSGlobalObject::symbolTableHasProperty):
+ * runtime/JSObject.cpp:
+ (JSC::getClassPropertyNames):
+ (JSC::JSObject::reifyStaticFunctionsForDelete):
+ (JSC::JSObject::putDirectBuiltinFunction):
+ * runtime/JSObject.h:
+ * runtime/JSSymbolTableObject.cpp:
+ (JSC::JSSymbolTableObject::getOwnNonIndexPropertyNames):
+ * runtime/JSSymbolTableObject.h:
+ (JSC::symbolTableGet):
+ (JSC::symbolTablePut):
+ (JSC::symbolTablePutWithAttributes):
+ * runtime/Lookup.cpp:
+ (JSC::setUpStaticFunctionSlot):
+ * runtime/Lookup.h:
+ (JSC::HashEntry::builtinGenerator):
+ (JSC::HashEntry::propertyGetter):
+ (JSC::HashEntry::propertyPutter):
+ (JSC::HashTable::entry):
+ (JSC::getStaticPropertySlot):
+ (JSC::getStaticValueSlot):
+ (JSC::putEntry):
+ * runtime/NativeErrorConstructor.cpp:
+ (JSC::NativeErrorConstructor::finishCreation):
+ * runtime/NativeErrorConstructor.h:
+ * runtime/PropertySlot.h:
+ * runtime/VM.cpp:
+ (JSC::VM::VM):
+ * runtime/VM.h:
+ (JSC::VM::builtinExecutables):
+
</ins><span class="cx"> 2014-02-11 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove some unintended copies in ranged for loops
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/DerivedSources.make (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/DerivedSources.make 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/DerivedSources.make 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -28,8 +28,9 @@
</span><span class="cx"> $(JavaScriptCore) \
</span><span class="cx"> $(JavaScriptCore)/parser \
</span><span class="cx"> $(JavaScriptCore)/runtime \
</span><del>- $(JavaScriptCore)/interpreter \
- $(JavaScriptCore)/jit \
</del><ins>+ $(JavaScriptCore)/interpreter \
+ $(JavaScriptCore)/jit \
+ $(JavaScriptCore)/builtins \
</ins><span class="cx"> #
</span><span class="cx">
</span><span class="cx"> .PHONY : all
</span><span class="lines">@@ -57,8 +58,18 @@
</span><span class="cx"> RegExpObject.lut.h \
</span><span class="cx"> StringConstructor.lut.h \
</span><span class="cx"> udis86_itab.h \
</span><ins>+ JSCBuiltins \
</ins><span class="cx"> #
</span><span class="cx">
</span><ins>+# builtin functions
+.PHONY: JSCBuiltins
+
+JSCBuiltins: $(JavaScriptCore)/generate-js-builtins JSCBuiltins.h JSCBuiltins.cpp
+JSCBuiltins.h: $(JavaScriptCore)/generate-js-builtins $(JavaScriptCore)/builtins/*.js
+ python $^ $@
+
+JSCBuiltins.cpp: JSCBuiltins.h
+
</ins><span class="cx"> # lookup tables for classes
</span><span class="cx">
</span><span class="cx"> %.lut.h: create_hash_table %.cpp
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreGNUmakefileam"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/GNUmakefile.am (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/GNUmakefile.am 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/GNUmakefile.am 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> -I$(srcdir)/Source/JavaScriptCore/ForwardingHeaders \
</span><span class="cx"> -I$(srcdir)/Source/JavaScriptCore/assembler \
</span><span class="cx"> -I$(srcdir)/Source/JavaScriptCore/bindings \
</span><ins>+ -I$(srcdir)/Source/JavaScriptCore/builtins \
</ins><span class="cx"> -I$(srcdir)/Source/JavaScriptCore/bytecode \
</span><span class="cx"> -I$(srcdir)/Source/JavaScriptCore/bytecompiler \
</span><span class="cx"> -I$(srcdir)/Source/JavaScriptCore/debugger \
</span><span class="lines">@@ -110,12 +111,16 @@
</span><span class="cx"> $(AM_V_GEN)$(RUBY) $(srcdir)/Source/JavaScriptCore/offlineasm/generate_offset_extractor.rb $(srcdir)/Source/JavaScriptCore/llint/LowLevelInterpreter.asm $@
</span><span class="cx"> $(AM_V_at)touch $@
</span><span class="cx">
</span><del>-$(Programs_LLIntOffsetsExtractor_OBJECTS): DerivedSources/JavaScriptCore/LLIntDesiredOffsets.h
</del><ins>+$(Programs_LLIntOffsetsExtractor_OBJECTS): DerivedSources/JavaScriptCore/LLIntDesiredOffsets.h
</ins><span class="cx">
</span><span class="cx"> DerivedSources/JavaScriptCore/LLIntAssembly.h: Programs/LLIntOffsetsExtractor$(EXEEXT)
</span><span class="cx"> $(AM_V_GEN)$(RUBY) $(srcdir)/Source/JavaScriptCore/offlineasm/asm.rb $(srcdir)/Source/JavaScriptCore/llint/LowLevelInterpreter.asm Programs/LLIntOffsetsExtractor$(EXEEXT) $@
</span><span class="cx"> $(AM_V_at)touch $@
</span><span class="cx">
</span><ins>+DerivedSources/JavaScriptCore/JSCBuiltins.h: DerivedSources/JavaScriptCore/JSCBuiltins.cpp
+DerivedSources/JavaScriptCore/JSCBuiltins.cpp: $(srcdir)/Source/JavaScriptCore/generate-js-builtins $(javascriptcore_builtins_js_nosources)
+ $(AM_V_GEN)$(PYTHON) $^ $@
+
</ins><span class="cx"> $(libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_OBJECTS): DerivedSources/JavaScriptCore/LLIntAssembly.h
</span><span class="cx">
</span><span class="cx"> jsc: $(javascriptcore_built_nosources) Programs/jsc$(EXEEXT)
</span><span class="lines">@@ -217,6 +222,7 @@
</span><span class="cx"> Source/JavaScriptCore/KeywordLookupGenerator.py \
</span><span class="cx"> Source/JavaScriptCore/parser/Keywords.table \
</span><span class="cx"> Source/JavaScriptCore/THANKS \
</span><ins>+ $(javascriptcore_builtins_js_nosources) \
</ins><span class="cx"> $(llint_nosources) \
</span><span class="cx"> $(offlineasm_nosources)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreGNUmakefilelistam"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/GNUmakefile.list.am (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/GNUmakefile.list.am 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/GNUmakefile.list.am 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -20,6 +20,8 @@
</span><span class="cx"> DerivedSources/JavaScriptCore/ErrorPrototype.lut.h \
</span><span class="cx"> DerivedSources/JavaScriptCore/JSDataViewPrototype.lut.h \
</span><span class="cx"> DerivedSources/JavaScriptCore/JSGlobalObject.lut.h \
</span><ins>+ DerivedSources/JavaScriptCore/JSCBuiltins.cpp \
+ DerivedSources/JavaScriptCore/JSCBuiltins.h \
</ins><span class="cx"> DerivedSources/JavaScriptCore/JSONObject.lut.h \
</span><span class="cx"> DerivedSources/JavaScriptCore/JSPromiseConstructor.lut.h \
</span><span class="cx"> DerivedSources/JavaScriptCore/JSPromisePrototype.lut.h \
</span><span class="lines">@@ -35,6 +37,9 @@
</span><span class="cx"> DerivedSources/JavaScriptCore/LLIntDesiredOffsets.h \
</span><span class="cx"> DerivedSources/JavaScriptCore/LLIntAssembly.h
</span><span class="cx">
</span><ins>+javascriptcore_builtins_js_nosources += \
+ Source/JavaScriptCore/builtins/Array.prototype.js
+
</ins><span class="cx"> javascriptcore_sources += \
</span><span class="cx"> Source/JavaScriptCore/API/APICallbackFunction.h \
</span><span class="cx"> Source/JavaScriptCore/API/APICast.h \
</span><span class="lines">@@ -102,6 +107,8 @@
</span><span class="cx"> Source/JavaScriptCore/bindings/ScriptObject.h \
</span><span class="cx"> Source/JavaScriptCore/bindings/ScriptValue.cpp \
</span><span class="cx"> Source/JavaScriptCore/bindings/ScriptValue.h \
</span><ins>+ Source/JavaScriptCore/builtins/BuiltinExecutables.cpp \
+ Source/JavaScriptCore/builtins/BuiltinExecutables.h \
</ins><span class="cx"> Source/JavaScriptCore/bytecode/ArrayAllocationProfile.cpp \
</span><span class="cx"> Source/JavaScriptCore/bytecode/ArrayAllocationProfile.h \
</span><span class="cx"> Source/JavaScriptCore/bytecode/ArrayProfile.cpp \
</span><span class="lines">@@ -1271,7 +1278,9 @@
</span><span class="cx"> DerivedSources/JavaScriptCore/InspectorJSFrontendDispatchers.cpp \
</span><span class="cx"> DerivedSources/JavaScriptCore/InspectorJSFrontendDispatchers.h \
</span><span class="cx"> DerivedSources/JavaScriptCore/InspectorJSTypeBuilders.cpp \
</span><del>- DerivedSources/JavaScriptCore/InspectorJSTypeBuilders.h
</del><ins>+ DerivedSources/JavaScriptCore/InspectorJSTypeBuilders.h \
+ DerivedSources/JavaScriptCore/JSCBuiltins.cpp \
+ DerivedSources/JavaScriptCore/JSCBuiltins.h
</ins><span class="cx">
</span><span class="cx"> llint_nosources += \
</span><span class="cx"> Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm \
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -309,6 +309,7 @@
</span><span class="cx"> <ClCompile Include="..\bindings\ScriptFunctionCall.cpp" />
</span><span class="cx"> <ClCompile Include="..\bindings\ScriptObject.cpp" />
</span><span class="cx"> <ClCompile Include="..\bindings\ScriptValue.cpp" />
</span><ins>+ <ClInclude Include="..\builtins\BuiltinExecutables.cpp" />
</ins><span class="cx"> <ClCompile Include="..\bytecode\ArrayAllocationProfile.cpp" />
</span><span class="cx"> <ClCompile Include="..\bytecode\ArrayProfile.cpp" />
</span><span class="cx"> <ClCompile Include="..\bytecode\BytecodeBasicBlock.cpp" />
</span><span class="lines">@@ -732,6 +733,7 @@
</span><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSBackendDispatchers.cpp" />
</span><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSFrontendDispatchers.cpp" />
</span><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSTypeBuilders.cpp" />
</span><ins>+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCBuiltins.cpp" />
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\ArrayConstructor.lut.h" />
</span><span class="lines">@@ -761,6 +763,7 @@
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\RegExpObject.lut.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\RegExpPrototype.lut.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\StringConstructor.lut.h" />
</span><ins>+ <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCBuiltins.h" />
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <ClInclude Include="..\API\APICallbackFunction.h" />
</span><span class="lines">@@ -809,6 +812,7 @@
</span><span class="cx"> <ClInclude Include="..\bindings\ScriptFunctionCall.h" />
</span><span class="cx"> <ClInclude Include="..\bindings\ScriptObject.h" />
</span><span class="cx"> <ClInclude Include="..\bindings\ScriptValue.h" />
</span><ins>+ <ClInclude Include="..\builtins\BuiltinExecutables.h" />
</ins><span class="cx"> <ClInclude Include="..\bytecode\ArrayAllocationProfile.h" />
</span><span class="cx"> <ClInclude Include="..\bytecode\ArrayProfile.h" />
</span><span class="cx"> <ClInclude Include="..\bytecode\ByValInfo.h" />
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -7,6 +7,9 @@
</span><span class="cx"> <Filter Include="bindings">
</span><span class="cx"> <UniqueIdentifier>{0bace123-4582-eebc-9314-7819b376c198}</UniqueIdentifier>
</span><span class="cx"> </Filter>
</span><ins>+ <Filter Include="builtins">
+ <UniqueIdentifier>{3b9d72a5-135b-43b3-a524-c6d2b9d29d35}</UniqueIdentifier>
+ </Filter>
</ins><span class="cx"> <Filter Include="bytecode">
</span><span class="cx"> <UniqueIdentifier>{766088a0-1216-4854-aa43-560c5e283668}</UniqueIdentifier>
</span><span class="cx"> </Filter>
</span><span class="lines">@@ -108,6 +111,9 @@
</span><span class="cx"> <ClCompile Include="..\assembler\MacroAssembler.cpp">
</span><span class="cx"> <Filter>assembler</Filter>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\builtins\BuiltinExecutables.cpp">
+ <Filter>builtins</Filter>
+ </ClCompile>
</ins><span class="cx"> <ClCompile Include="..\bytecode\ArrayAllocationProfile.cpp">
</span><span class="cx"> <Filter>bytecode</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -1329,6 +1335,9 @@
</span><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSTypeBuilders.cpp">
</span><span class="cx"> <Filter>Derived Sources</Filter>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCBuiltins.cpp">
+ <Filter>Derived Sources</Filter>
+ </ClCompile>
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <ClInclude Include="..\API\APICallbackFunction.h">
</span><span class="lines">@@ -1454,6 +1463,9 @@
</span><span class="cx"> <ClInclude Include="..\assembler\X86Assembler.h">
</span><span class="cx"> <Filter>assembler</Filter>
</span><span class="cx"> </ClInclude>
</span><ins>+ <ClCompile Include="..\builtins\BuiltinExecutables.h">
+ <Filter>builtins</Filter>
+ </ClCompile>
</ins><span class="cx"> <ClInclude Include="..\bytecode\ArrayAllocationProfile.h">
</span><span class="cx"> <Filter>bytecode</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -2556,6 +2568,9 @@
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\ArrayPrototype.lut.h">
</span><span class="cx"> <Filter>Derived Sources</Filter>
</span><span class="cx"> </ClInclude>
</span><ins>+ <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCBuiltins.h">
+ <Filter>Derived Sources</Filter>
+ </ClInclude>
</ins><span class="cx"> <ClInclude Include="..\runtime\VM.h">
</span><span class="cx"> <Filter>runtime</Filter>
</span><span class="cx"> </ClInclude>
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCoreCommonprops"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreCommon.props (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreCommon.props 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreCommon.props 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> <PropertyGroup />
</span><span class="cx"> <ItemDefinitionGroup>
</span><span class="cx"> <ClCompile>
</span><del>- <AdditionalIncludeDirectories>..\;..\tools\;..\runtime\;..\llint\;..\jit\;..\disassembler\;..\heap\;..\debugger\;..\assembler\;..\profiler\;..\yarr\;..\interpreter\;..\bytecode\;..\dfg\;..\bytecompiler\;..\parser\;..\API\;..\ftl\;..\bindings\;..\inspector\;$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\JavaScriptCore\DerivedSources\;$(ConfigurationBuildDir)\include\;$(ConfigurationBuildDir)\include\JavaScriptCore\;$(ConfigurationBuildDir)\include\private\;$(WebKit_Libraries)\include;$(WebKit_Libraries)\include\private;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</del><ins>+ <AdditionalIncludeDirectories>..\;..\tools\;..\runtime\;..\llint\;..\jit\;..\disassembler\;..\heap\;..\debugger\;..\assembler\;..\profiler\;..\yarr\;..\interpreter\;..\bytecode\;..\builtins\;..\dfg\;..\bytecompiler\;..\parser\;..\API\;..\ftl\;..\bindings\;..\inspector\;$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\JavaScriptCore\DerivedSources\;$(ConfigurationBuildDir)\include\;$(ConfigurationBuildDir)\include\JavaScriptCore\;$(ConfigurationBuildDir)\include\private\;$(WebKit_Libraries)\include;$(WebKit_Libraries)\include\private;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ins><span class="cx"> <ForcedIncludeFiles>ICUVersion.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
</span><span class="cx"> </ClCompile>
</span><span class="cx"> <Link>
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojcopyfilescmd"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/copy-files.cmd (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/copy-files.cmd 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/copy-files.cmd 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> assembler
</span><span class="cx"> bindings
</span><span class="cx"> bytecode
</span><ins>+ builtins
</ins><span class="cx"> dfg
</span><span class="cx"> disassembler
</span><span class="cx"> heap
</span><span class="lines">@@ -72,6 +73,9 @@
</span><span class="cx"> xcopy /y "%DerivedSourcesDirectory%\InspectorJSBackendDispatchers.h" "%PrivateHeadersDirectory%" >NUL
</span><span class="cx"> xcopy /y "%DerivedSourcesDirectory%\InspectorJSFrontendDispatchers.h" "%PrivateHeadersDirectory%" >NUL
</span><span class="cx">
</span><ins>+echo Copying builtins header as if it were a private header...
+xcopy /y "%DerivedSourcesDirectory%\JSCBuiltins.h" "%PrivateHeadersDirectory%" >NUL
+
</ins><span class="cx"> echo Copying resources...
</span><span class="cx"> mkdir "%ResourcesDirectory%" 2>NUL
</span><span class="cx"> xcopy /y /d JavaScriptCore.resources\* "%ResourcesDirectory%" >NUL
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -1101,6 +1101,7 @@
</span><span class="cx"> A74DEF95182D991400522C22 /* JSMapIterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A74DEF8F182D991400522C22 /* JSMapIterator.cpp */; };
</span><span class="cx"> A74DEF96182D991400522C22 /* JSMapIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = A74DEF90182D991400522C22 /* JSMapIterator.h */; };
</span><span class="cx"> A75706DE118A2BCF0057F88F /* JITArithmetic32_64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A75706DD118A2BCF0057F88F /* JITArithmetic32_64.cpp */; };
</span><ins>+ A75EE9B218AAB7E200AAD043 /* BuiltinNames.h in Headers */ = {isa = PBXBuildFile; fileRef = A75EE9B018AAB7E200AAD043 /* BuiltinNames.h */; };
</ins><span class="cx"> A76140CD182982CB00750624 /* ArgumentsIteratorConstructor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A76140C7182982CB00750624 /* ArgumentsIteratorConstructor.cpp */; };
</span><span class="cx"> A76140CE182982CB00750624 /* ArgumentsIteratorConstructor.h in Headers */ = {isa = PBXBuildFile; fileRef = A76140C8182982CB00750624 /* ArgumentsIteratorConstructor.h */; };
</span><span class="cx"> A76140CF182982CB00750624 /* ArgumentsIteratorPrototype.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A76140C9182982CB00750624 /* ArgumentsIteratorPrototype.cpp */; };
</span><span class="lines">@@ -1187,6 +1188,10 @@
</span><span class="cx"> A7CA3AE817DA41AE006538AF /* JSWeakMap.h in Headers */ = {isa = PBXBuildFile; fileRef = A7CA3AE217DA41AE006538AF /* JSWeakMap.h */; };
</span><span class="cx"> A7CA3AEB17DA5168006538AF /* WeakMapData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7CA3AE917DA5168006538AF /* WeakMapData.cpp */; };
</span><span class="cx"> A7CA3AEC17DA5168006538AF /* WeakMapData.h in Headers */ = {isa = PBXBuildFile; fileRef = A7CA3AEA17DA5168006538AF /* WeakMapData.h */; };
</span><ins>+ A7D801A41880D66E0026C39B /* BuiltinExecutables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7D801A11880D66E0026C39B /* BuiltinExecutables.cpp */; };
+ A7D801A51880D66E0026C39B /* BuiltinExecutables.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D801A21880D66E0026C39B /* BuiltinExecutables.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ A7D801A81880D6A80026C39B /* JSCBuiltins.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7D801A61880D6A80026C39B /* JSCBuiltins.cpp */; };
+ A7D801A91880D6A80026C39B /* JSCBuiltins.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D801A71880D6A80026C39B /* JSCBuiltins.h */; };
</ins><span class="cx"> A7D89CF217A0B8CC00773AD8 /* DFGBasicBlock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7D89CE317A0B8CC00773AD8 /* DFGBasicBlock.cpp */; };
</span><span class="cx"> A7D89CF317A0B8CC00773AD8 /* DFGBlockInsertionSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7D89CE417A0B8CC00773AD8 /* DFGBlockInsertionSet.cpp */; };
</span><span class="cx"> A7D89CF417A0B8CC00773AD8 /* DFGBlockInsertionSet.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D89CE517A0B8CC00773AD8 /* DFGBlockInsertionSet.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -2147,7 +2152,7 @@
</span><span class="cx"> 14D857740A4696C80032146C /* testapi.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = testapi.js; path = API/tests/testapi.js; sourceTree = "<group>"; };
</span><span class="cx"> 14DA818E0D99FD2000B0A4FB /* JSActivation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSActivation.h; sourceTree = "<group>"; };
</span><span class="cx"> 14DA818F0D99FD2000B0A4FB /* JSActivation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSActivation.cpp; sourceTree = "<group>"; };
</span><del>- 14DE0D680D02431400AACCA2 /* JSGlobalObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSGlobalObject.cpp; sourceTree = "<group>"; };
</del><ins>+ 14DE0D680D02431400AACCA2 /* JSGlobalObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = JSGlobalObject.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
</ins><span class="cx"> 14DF04D916B3996D0016A513 /* StaticPropertyAnalysis.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StaticPropertyAnalysis.h; sourceTree = "<group>"; };
</span><span class="cx"> 14E84F9914EE1ACC00D6D5D4 /* WeakBlock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WeakBlock.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 14E84F9A14EE1ACC00D6D5D4 /* WeakBlock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WeakBlock.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -2229,7 +2234,7 @@
</span><span class="cx"> 65FB5115184EE8F800C12B70 /* ProtoCallFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProtoCallFrame.h; sourceTree = "<group>"; };
</span><span class="cx"> 65FB5116184EE9BC00C12B70 /* ProtoCallFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ProtoCallFrame.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 704FD35305697E6D003DBED9 /* BooleanObject.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = BooleanObject.h; sourceTree = "<group>"; tabWidth = 8; };
</span><del>- 7C008CD0186F8A9300955C24 /* JSPromiseFunctions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSPromiseFunctions.cpp; sourceTree = "<group>"; };
</del><ins>+ 7C008CD0186F8A9300955C24 /* JSPromiseFunctions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = JSPromiseFunctions.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
</ins><span class="cx"> 7C008CD1186F8A9300955C24 /* JSPromiseFunctions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSPromiseFunctions.h; sourceTree = "<group>"; };
</span><span class="cx"> 7C008CD8187124BB00955C24 /* JSPromiseDeferred.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSPromiseDeferred.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 7C008CD9187124BB00955C24 /* JSPromiseDeferred.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSPromiseDeferred.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -2238,9 +2243,9 @@
</span><span class="cx"> 7C008CE5187631B600955C24 /* Microtask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Microtask.h; sourceTree = "<group>"; };
</span><span class="cx"> 7C184E1817BEDBD3007CB63A /* JSPromise.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSPromise.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 7C184E1917BEDBD3007CB63A /* JSPromise.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSPromise.h; sourceTree = "<group>"; };
</span><del>- 7C184E1C17BEE22E007CB63A /* JSPromisePrototype.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSPromisePrototype.cpp; sourceTree = "<group>"; };
</del><ins>+ 7C184E1C17BEE22E007CB63A /* JSPromisePrototype.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = JSPromisePrototype.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
</ins><span class="cx"> 7C184E1D17BEE22E007CB63A /* JSPromisePrototype.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSPromisePrototype.h; sourceTree = "<group>"; };
</span><del>- 7C184E2017BEE240007CB63A /* JSPromiseConstructor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSPromiseConstructor.cpp; sourceTree = "<group>"; };
</del><ins>+ 7C184E2017BEE240007CB63A /* JSPromiseConstructor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = JSPromiseConstructor.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
</ins><span class="cx"> 7C184E2117BEE240007CB63A /* JSPromiseConstructor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSPromiseConstructor.h; sourceTree = "<group>"; };
</span><span class="cx"> 7C184E2417BFFA36007CB63A /* JSPromiseConstructor.lut.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JSPromiseConstructor.lut.h; sourceTree = "<group>"; };
</span><span class="cx"> 7C184E2517BFFA36007CB63A /* JSPromisePrototype.lut.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JSPromisePrototype.lut.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -2541,6 +2546,7 @@
</span><span class="cx"> A71236E41195F33C00BD2174 /* JITOpcodes32_64.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JITOpcodes32_64.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A718F61A11754A21002465A7 /* RegExpJitTables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RegExpJitTables.h; sourceTree = "<group>"; };
</span><span class="cx"> A718F8211178EB4B002465A7 /* create_regex_tables */ = {isa = PBXFileReference; explicitFileType = text.script.python; fileEncoding = 4; path = create_regex_tables; sourceTree = "<group>"; };
</span><ins>+ A71DA80D1880D71F00D1F299 /* generate-js-builtins */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = "generate-js-builtins"; sourceTree = "<group>"; };
</ins><span class="cx"> A72028B41797601E0098028C /* JSCTestRunnerUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCTestRunnerUtils.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A72028B51797601E0098028C /* JSCTestRunnerUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCTestRunnerUtils.h; sourceTree = "<group>"; };
</span><span class="cx"> A72028B91797603D0098028C /* JSFunctionInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSFunctionInlines.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -2580,9 +2586,10 @@
</span><span class="cx"> A74DEF8F182D991400522C22 /* JSMapIterator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMapIterator.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A74DEF90182D991400522C22 /* JSMapIterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMapIterator.h; sourceTree = "<group>"; };
</span><span class="cx"> A75706DD118A2BCF0057F88F /* JITArithmetic32_64.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JITArithmetic32_64.cpp; sourceTree = "<group>"; };
</span><ins>+ A75EE9B018AAB7E200AAD043 /* BuiltinNames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BuiltinNames.h; sourceTree = "<group>"; };
</ins><span class="cx"> A76140C7182982CB00750624 /* ArgumentsIteratorConstructor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ArgumentsIteratorConstructor.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A76140C8182982CB00750624 /* ArgumentsIteratorConstructor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArgumentsIteratorConstructor.h; sourceTree = "<group>"; };
</span><del>- A76140C9182982CB00750624 /* ArgumentsIteratorPrototype.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ArgumentsIteratorPrototype.cpp; sourceTree = "<group>"; };
</del><ins>+ A76140C9182982CB00750624 /* ArgumentsIteratorPrototype.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = ArgumentsIteratorPrototype.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
</ins><span class="cx"> A76140CA182982CB00750624 /* ArgumentsIteratorPrototype.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArgumentsIteratorPrototype.h; sourceTree = "<group>"; };
</span><span class="cx"> A76140CB182982CB00750624 /* JSArgumentsIterator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSArgumentsIterator.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A76140CC182982CB00750624 /* JSArgumentsIterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSArgumentsIterator.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -2647,9 +2654,9 @@
</span><span class="cx"> A7B4ACAE1484C9CE00B38A36 /* JSExportMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSExportMacros.h; sourceTree = "<group>"; };
</span><span class="cx"> A7BDAEC017F4EA1400F6140C /* ArrayIteratorConstructor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ArrayIteratorConstructor.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A7BDAEC117F4EA1400F6140C /* ArrayIteratorConstructor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArrayIteratorConstructor.h; sourceTree = "<group>"; };
</span><del>- A7BDAEC217F4EA1400F6140C /* ArrayIteratorPrototype.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ArrayIteratorPrototype.cpp; sourceTree = "<group>"; };
</del><ins>+ A7BDAEC217F4EA1400F6140C /* ArrayIteratorPrototype.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = ArrayIteratorPrototype.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
</ins><span class="cx"> A7BDAEC317F4EA1400F6140C /* ArrayIteratorPrototype.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArrayIteratorPrototype.h; sourceTree = "<group>"; };
</span><del>- A7BDAEC417F4EA1400F6140C /* JSArrayIterator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSArrayIterator.cpp; sourceTree = "<group>"; };
</del><ins>+ A7BDAEC417F4EA1400F6140C /* JSArrayIterator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = JSArrayIterator.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
</ins><span class="cx"> A7BDAEC517F4EA1400F6140C /* JSArrayIterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSArrayIterator.h; sourceTree = "<group>"; };
</span><span class="cx"> A7BFF3BF179868940002F462 /* DFGFiltrationResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DFGFiltrationResult.h; path = dfg/DFGFiltrationResult.h; sourceTree = "<group>"; };
</span><span class="cx"> A7C0C4AA167C08CD0017011D /* JSScriptRef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSScriptRef.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -2669,6 +2676,11 @@
</span><span class="cx"> A7CA3AE217DA41AE006538AF /* JSWeakMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWeakMap.h; sourceTree = "<group>"; };
</span><span class="cx"> A7CA3AE917DA5168006538AF /* WeakMapData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WeakMapData.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A7CA3AEA17DA5168006538AF /* WeakMapData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WeakMapData.h; sourceTree = "<group>"; };
</span><ins>+ A7D801A01880D66E0026C39B /* Array.prototype.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = Array.prototype.js; sourceTree = "<group>"; };
+ A7D801A11880D66E0026C39B /* BuiltinExecutables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BuiltinExecutables.cpp; sourceTree = "<group>"; };
+ A7D801A21880D66E0026C39B /* BuiltinExecutables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BuiltinExecutables.h; sourceTree = "<group>"; };
+ A7D801A61880D6A80026C39B /* JSCBuiltins.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCBuiltins.cpp; sourceTree = "<group>"; };
+ A7D801A71880D6A80026C39B /* JSCBuiltins.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCBuiltins.h; sourceTree = "<group>"; };
</ins><span class="cx"> A7D89CE317A0B8CC00773AD8 /* DFGBasicBlock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DFGBasicBlock.cpp; path = dfg/DFGBasicBlock.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A7D89CE417A0B8CC00773AD8 /* DFGBlockInsertionSet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DFGBlockInsertionSet.cpp; path = dfg/DFGBlockInsertionSet.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A7D89CE517A0B8CC00773AD8 /* DFGBlockInsertionSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DFGBlockInsertionSet.h; path = dfg/DFGBlockInsertionSet.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -2871,7 +2883,7 @@
</span><span class="cx"> F5BB2BC5030F772101FCFE1D /* Completion.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = Completion.h; sourceTree = "<group>"; tabWidth = 8; };
</span><span class="cx"> F5C290E60284F98E018635CA /* JavaScriptCorePrefix.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = JavaScriptCorePrefix.h; sourceTree = "<group>"; tabWidth = 8; };
</span><span class="cx"> F68EBB8C0255D4C601FF60F7 /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; tabWidth = 8; };
</span><del>- F692A84D0255597D01FF60F7 /* ArrayPrototype.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ArrayPrototype.cpp; sourceTree = "<group>"; tabWidth = 8; };
</del><ins>+ F692A84D0255597D01FF60F7 /* ArrayPrototype.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = ArrayPrototype.cpp; sourceTree = "<group>"; tabWidth = 8; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
</ins><span class="cx"> F692A84E0255597D01FF60F7 /* ArrayPrototype.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = ArrayPrototype.h; sourceTree = "<group>"; tabWidth = 8; };
</span><span class="cx"> F692A8500255597D01FF60F7 /* BooleanObject.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BooleanObject.cpp; sourceTree = "<group>"; tabWidth = 8; };
</span><span class="cx"> F692A8540255597D01FF60F7 /* create_hash_table */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = text.script.perl; path = create_hash_table; sourceTree = "<group>"; tabWidth = 8; };
</span><span class="lines">@@ -3009,6 +3021,7 @@
</span><span class="cx"> 8604F4F2143A6C4400B295F5 /* ChangeLog */,
</span><span class="cx"> F692A8540255597D01FF60F7 /* create_hash_table */,
</span><span class="cx"> A718F8211178EB4B002465A7 /* create_regex_tables */,
</span><ins>+ A71DA80D1880D71F00D1F299 /* generate-js-builtins */,
</ins><span class="cx"> 45E12D8806A49B0F00E9DF84 /* jsc.cpp */,
</span><span class="cx"> F68EBB8C0255D4C601FF60F7 /* config.h */,
</span><span class="cx"> F5C290E60284F98E018635CA /* JavaScriptCorePrefix.h */,
</span><span class="lines">@@ -3017,6 +3030,7 @@
</span><span class="cx"> 1432EBD70A34CAD400717B9F /* API */,
</span><span class="cx"> 9688CB120ED12B4E001D649F /* assembler */,
</span><span class="cx"> A54CF2EA184EA73900237F19 /* bindings */,
</span><ins>+ A7D8019F1880D66E0026C39B /* builtins */,
</ins><span class="cx"> 969A078F0ED1D3AE00F1F681 /* bytecode */,
</span><span class="cx"> 7E39D81D0EC38EFA003AF11A /* bytecompiler */,
</span><span class="cx"> 1C90513E0BA9E8830081E9D0 /* Configurations */,
</span><span class="lines">@@ -3601,6 +3615,8 @@
</span><span class="cx"> 650FDF8D09D0FCA700769E54 /* Derived Sources */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><ins>+ A7D801A61880D6A80026C39B /* JSCBuiltins.cpp */,
+ A7D801A71880D6A80026C39B /* JSCBuiltins.h */,
</ins><span class="cx"> BC18C5230E16FC8A00B34460 /* ArrayPrototype.lut.h */,
</span><span class="cx"> BCD203E70E1718F4002C7E82 /* DatePrototype.lut.h */,
</span><span class="cx"> A513E5C6185F9436007E95AD /* InjectedScriptSource.h */,
</span><span class="lines">@@ -4704,6 +4720,17 @@
</span><span class="cx"> path = remote;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="cx"> };
</span><ins>+ A7D8019F1880D66E0026C39B /* builtins */ = {
+ isa = PBXGroup;
+ children = (
+ A7D801A01880D66E0026C39B /* Array.prototype.js */,
+ A7D801A11880D66E0026C39B /* BuiltinExecutables.cpp */,
+ A7D801A21880D66E0026C39B /* BuiltinExecutables.h */,
+ A75EE9B018AAB7E200AAD043 /* BuiltinNames.h */,
+ );
+ path = builtins;
+ sourceTree = "<group>";
+ };
</ins><span class="cx"> /* End PBXGroup section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXHeadersBuildPhase section */
</span><span class="lines">@@ -4913,6 +4940,7 @@
</span><span class="cx"> 0FD81AD3154FB4F000983E72 /* DFGDominators.h in Headers */,
</span><span class="cx"> 0F1E3A471534CBB9000F9456 /* DFGDoubleFormatState.h in Headers */,
</span><span class="cx"> 0FD3C82814115D4F00FD81CB /* DFGDriver.h in Headers */,
</span><ins>+ A75EE9B218AAB7E200AAD043 /* BuiltinNames.h in Headers */,
</ins><span class="cx"> 0F66E16C14DF3F1600B7B2E4 /* DFGEdge.h in Headers */,
</span><span class="cx"> A7D9A29617A0BC7400EE2618 /* DFGEdgeDominates.h in Headers */,
</span><span class="cx"> A7986D5717A0BB1E00A95DD0 /* DFGEdgeUsesStructure.h in Headers */,
</span><span class="lines">@@ -5027,6 +5055,7 @@
</span><span class="cx"> 0FEA0A1D1708B00700BB722C /* FTLAbstractHeap.h in Headers */,
</span><span class="cx"> 0FEA0A1F1708B00700BB722C /* FTLAbstractHeapRepository.h in Headers */,
</span><span class="cx"> A59455931824744700CC3843 /* JSGlobalObjectDebuggable.h in Headers */,
</span><ins>+ A7D801A91880D6A80026C39B /* JSCBuiltins.h in Headers */,
</ins><span class="cx"> 0FEA0A0A170513DB00BB722C /* FTLCapabilities.h in Headers */,
</span><span class="cx"> 0F48532A187DFDEC0083B687 /* FTLRecoveryOpcode.h in Headers */,
</span><span class="cx"> 0FEA0A231709606900BB722C /* FTLCommonValues.h in Headers */,
</span><span class="lines">@@ -5103,6 +5132,7 @@
</span><span class="cx"> BC18C40F0E16F5CD00B34460 /* Identifier.h in Headers */,
</span><span class="cx"> C25F8BCE157544A900245B71 /* IncrementalSweeper.h in Headers */,
</span><span class="cx"> 0FB7F39915ED8E4600F167B2 /* IndexingHeader.h in Headers */,
</span><ins>+ A7D801A51880D66E0026C39B /* BuiltinExecutables.h in Headers */,
</ins><span class="cx"> 0FB7F39A15ED8E4600F167B2 /* IndexingHeaderInlines.h in Headers */,
</span><span class="cx"> 0FB7F39B15ED8E4600F167B2 /* IndexingType.h in Headers */,
</span><span class="cx"> 0FCEFAB01805CA6D00472CE4 /* InitializeLLVM.h in Headers */,
</span><span class="lines">@@ -6007,6 +6037,7 @@
</span><span class="cx"> A7D89CF217A0B8CC00773AD8 /* DFGBasicBlock.cpp in Sources */,
</span><span class="cx"> A70B083217A0B79B00DAF14B /* DFGBinarySwitch.cpp in Sources */,
</span><span class="cx"> A7D89CF317A0B8CC00773AD8 /* DFGBlockInsertionSet.cpp in Sources */,
</span><ins>+ A7D801A41880D66E0026C39B /* BuiltinExecutables.cpp in Sources */,
</ins><span class="cx"> 86EC9DC41328DF82002B2AD7 /* DFGByteCodeParser.cpp in Sources */,
</span><span class="cx"> 0FD82E2114172CE300179C94 /* DFGCapabilities.cpp in Sources */,
</span><span class="cx"> 0FFFC95714EF90A000C72532 /* DFGCFAPhase.cpp in Sources */,
</span><span class="lines">@@ -6023,6 +6054,7 @@
</span><span class="cx"> 0FFFC95914EF90A600C72532 /* DFGCSEPhase.cpp in Sources */,
</span><span class="cx"> 0F2FC77216E12F710038D976 /* DFGDCEPhase.cpp in Sources */,
</span><span class="cx"> 0F8F2B99172F04FF007DBDA5 /* DFGDesiredIdentifiers.cpp in Sources */,
</span><ins>+ A7D801A81880D6A80026C39B /* JSCBuiltins.cpp in Sources */,
</ins><span class="cx"> A73E1330179624CD00E4DEA8 /* DFGDesiredStructureChains.cpp in Sources */,
</span><span class="cx"> C2C0F7CD17BBFC5B00464FE4 /* DFGDesiredTransitions.cpp in Sources */,
</span><span class="cx"> 0FE8534B1723CDA500B618F5 /* DFGDesiredWatchpoints.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebuiltinsArrayprototypejsfromrev163959trunkSourceJavaScriptCoreruntimeJSFunctionInlinesh"></a>
<div class="copfile"><h4>Copied: trunk/Source/JavaScriptCore/builtins/Array.prototype.js (from rev 163959, trunk/Source/JavaScriptCore/runtime/JSFunctionInlines.h) (0 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/builtins/Array.prototype.js (rev 0)
+++ trunk/Source/JavaScriptCore/builtins/Array.prototype.js 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -0,0 +1,51 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+function every(callback /*, thisArg */) {
+ "use strict";
+ if (this === null)
+ throw new @TypeError("Array.prototype.every requires that |this| not be null");
+
+ if (this === undefined)
+ throw new @TypeError("Array.prototype.every requires that |this| not be undefined");
+
+ var array = @Object(this);
+ var length = array.length >>> 0;
+
+ if (typeof callback !== "function")
+ throw new @TypeError("Array.prototype.every callback must be a function");
+
+ var thisArg = arguments.length > 1 ? arguments[1] : undefined;
+
+ for (var i = 0; i < length; i++) {
+ if (!(i in array))
+ continue;
+ if (!callback.@call(thisArg, array[i], i, array))
+ return false;
+ }
+
+ return true;
+}
+
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCorebuiltinsBuiltinExecutablescpp"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/builtins/BuiltinExecutables.cpp (0 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/builtins/BuiltinExecutables.cpp (rev 0)
+++ trunk/Source/JavaScriptCore/builtins/BuiltinExecutables.cpp 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -0,0 +1,95 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+#include "config.h"
+#include "BuiltinExecutables.h"
+
+#include "BuiltinNames.h"
+#include "Executable.h"
+#include "JSCInlines.h"
+#include "Parser.h"
+
+namespace JSC {
+
+BuiltinExecutables::BuiltinExecutables(VM& vm)
+ : m_vm(vm)
+#define INITIALIZE_BUILTIN_SOURCE_MEMBERS(name, functionName, length) , m_##name##Source(makeSource(StringImpl::createFromLiteral(s_##name, length), StringImpl::createFromLiteral("<builtin>")))
+ JSC_FOREACH_BUILTIN(INITIALIZE_BUILTIN_SOURCE_MEMBERS)
+#undef EXPOSE_BUILTIN_STRINGS
+{
+}
+
+UnlinkedFunctionExecutable* BuiltinExecutables::createBuiltinExecutable(const SourceCode& source, const Identifier& name)
+{
+ JSTextPosition positionBeforeLastNewline;
+ ParserError error;
+ RefPtr<ProgramNode> program = parse<ProgramNode>(&m_vm, source, 0, Identifier(), JSParseBuiltin, JSParseProgramCode, error, &positionBeforeLastNewline);
+
+ if (!program) {
+ dataLog("Fatal error compiling builtin function '", name.string(), "': ", error.m_message);
+ CRASH();
+ }
+
+ StatementNode* exprStatement = program->singleStatement();
+ RELEASE_ASSERT(exprStatement);
+ RELEASE_ASSERT(exprStatement->isExprStatement());
+ ExpressionNode* funcExpr = static_cast<ExprStatementNode*>(exprStatement)->expr();
+ RELEASE_ASSERT(funcExpr);
+ RELEASE_ASSERT(funcExpr->isFuncExprNode());
+ FunctionBodyNode* body = static_cast<FuncExprNode*>(funcExpr)->body();
+ RELEASE_ASSERT(!program->hasCapturedVariables());
+
+ body->setEndPosition(positionBeforeLastNewline);
+ RELEASE_ASSERT(body);
+ RELEASE_ASSERT(body->ident().isNull());
+
+ // This function assumes an input string that would result in a single anonymous function expression.
+ body->setEndPosition(positionBeforeLastNewline);
+ RELEASE_ASSERT(body);
+ for (const auto& closedVariable : program->closedVariables()) {
+ if (closedVariable == m_vm.propertyNames->arguments.impl())
+ continue;
+
+ if (closedVariable == m_vm.propertyNames->undefinedKeyword.impl())
+ continue;
+ RELEASE_ASSERT(closedVariable->isEmptyUnique());
+ }
+ UnlinkedFunctionExecutable* functionExecutable = UnlinkedFunctionExecutable::create(&m_vm, source, body, true, UnlinkedBuiltinFunction);
+ functionExecutable->m_nameValue.set(m_vm, functionExecutable, jsString(&m_vm, name.string()));
+ return functionExecutable;
+}
+
+#define DEFINE_BUILTIN_EXECUTABLES(name, functionName, length) \
+UnlinkedFunctionExecutable* BuiltinExecutables::name##Executable() \
+{\
+ if (!m_##name##Executable)\
+ m_##name##Executable = createBuiltinExecutable(m_##name##Source, m_vm.propertyNames->builtinNames().functionName());\
+ return m_##name##Executable.get();\
+}
+JSC_FOREACH_BUILTIN(DEFINE_BUILTIN_EXECUTABLES)
+#undef EXPOSE_BUILTIN_SOURCES
+
+}
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCorebuiltinsBuiltinExecutableshfromrev163959trunkSourceJavaScriptCoreruntimeJSFunctionInlinesh"></a>
<div class="copfile"><h4>Copied: trunk/Source/JavaScriptCore/builtins/BuiltinExecutables.h (from rev 163959, trunk/Source/JavaScriptCore/runtime/JSFunctionInlines.h) (0 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/builtins/BuiltinExecutables.h (rev 0)
+++ trunk/Source/JavaScriptCore/builtins/BuiltinExecutables.h 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -0,0 +1,67 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef BuiltinExecutables_h
+#define BuiltinExecutables_h
+
+#include "JSCBuiltins.h"
+#include "SourceCode.h"
+#include "Weak.h"
+#include <wtf/PassOwnPtr.h>
+
+namespace JSC {
+
+class UnlinkedFunctionExecutable;
+class Identifier;
+class VM;
+
+class BuiltinExecutables {
+public:
+ static PassOwnPtr<BuiltinExecutables> create(VM& vm)
+ {
+ return adoptPtr(new BuiltinExecutables(vm));
+ }
+
+#define EXPOSE_BUILTIN_EXECUTABLES(name, functionName, length) \
+UnlinkedFunctionExecutable* name##Executable(); \
+const SourceCode& name##Source() { return m_##name##Source; }
+
+ JSC_FOREACH_BUILTIN(EXPOSE_BUILTIN_EXECUTABLES)
+#undef EXPOSE_BUILTIN_SOURCES
+
+private:
+ BuiltinExecutables(VM&);
+ VM& m_vm;
+ UnlinkedFunctionExecutable* createBuiltinExecutable(const SourceCode&, const Identifier&);
+#define DECLARE_BUILTIN_SOURCE_MEMBERS(name, functionName, length)\
+ SourceCode m_##name##Source; \
+ Weak<UnlinkedFunctionExecutable> m_##name##Executable;
+ JSC_FOREACH_BUILTIN(DECLARE_BUILTIN_SOURCE_MEMBERS)
+#undef DECLARE_BUILTIN_SOURCE_MEMBERS
+};
+
+}
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCorebuiltinsBuiltinNamesh"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/builtins/BuiltinNames.h (0 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/builtins/BuiltinNames.h (rev 0)
+++ trunk/Source/JavaScriptCore/builtins/BuiltinNames.h 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -0,0 +1,97 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef BuiltinNames_h
+#define BuiltinNames_h
+
+#include "CommonIdentifiers.h"
+#include "JSCBuiltins.h"
+
+namespace JSC {
+
+#define INITIALISE_BUILTIN_NAMES(name) , m_##name(vm, #name), m_##name##PrivateName(Identifier::from(PrivateName()))
+#define DECLARE_BUILTIN_NAMES(name) const Identifier m_##name; const Identifier m_##name##PrivateName;;
+#define DECLARE_BUILTIN_IDENTIFIER_ACCESSOR(name) \
+ const Identifier& name() const { return m_##name; } \
+ const Identifier& name##PrivateName() const { return m_##name##PrivateName; }
+
+#define INITIALISE_PRIVATE_TO_PUBLIC_ENTRY(name) m_privateToPublicMap.add(m_##name##PrivateName.impl(), &m_##name);
+#define INITIALISE_PUBLIC_TO_PRIVATE_ENTRY(name) m_publicToPrivateMap.add(m_##name.impl(), &m_##name##PrivateName);
+
+class BuiltinNames {
+ WTF_MAKE_NONCOPYABLE(BuiltinNames); WTF_MAKE_FAST_ALLOCATED;
+
+public:
+ BuiltinNames(VM* vm, CommonIdentifiers* commonIdentifiers)
+ : m_emptyIdentifier(commonIdentifiers->emptyIdentifier)
+ JSC_FOREACH_BUILTIN_FUNCTION_NAME(INITIALISE_BUILTIN_NAMES)
+ JSC_COMMON_PRIVATE_IDENTIFIERS_EACH_PROPERTY_NAME(INITIALISE_BUILTIN_NAMES)
+ {
+ JSC_FOREACH_BUILTIN_FUNCTION_NAME(INITIALISE_PRIVATE_TO_PUBLIC_ENTRY)
+ JSC_COMMON_PRIVATE_IDENTIFIERS_EACH_PROPERTY_NAME(INITIALISE_PRIVATE_TO_PUBLIC_ENTRY)
+ JSC_FOREACH_BUILTIN_FUNCTION_NAME(INITIALISE_PUBLIC_TO_PRIVATE_ENTRY)
+ JSC_COMMON_PRIVATE_IDENTIFIERS_EACH_PROPERTY_NAME(INITIALISE_PUBLIC_TO_PRIVATE_ENTRY)
+ }
+
+ const Identifier* getPrivateName(const Identifier&) const;
+ const Identifier& getPublicName(const Identifier&) const;
+
+ JSC_FOREACH_BUILTIN_FUNCTION_NAME(DECLARE_BUILTIN_IDENTIFIER_ACCESSOR)
+ JSC_COMMON_PRIVATE_IDENTIFIERS_EACH_PROPERTY_NAME(DECLARE_BUILTIN_IDENTIFIER_ACCESSOR)
+
+private:
+ Identifier m_emptyIdentifier;
+ JSC_FOREACH_BUILTIN_FUNCTION_NAME(DECLARE_BUILTIN_NAMES)
+ JSC_COMMON_PRIVATE_IDENTIFIERS_EACH_PROPERTY_NAME(DECLARE_BUILTIN_NAMES)
+ typedef HashMap<RefPtr<StringImpl>, const Identifier*, IdentifierRepHash> BuiltinNamesMap;
+ BuiltinNamesMap m_publicToPrivateMap;
+ BuiltinNamesMap m_privateToPublicMap;
+};
+
+#undef DECLARE_BUILTIN_NAMES
+#undef INITIALISE_BUILTIN_NAMES
+#undef DECLARE_BUILTIN_IDENTIFIER_ACCESSOR
+
+
+inline const Identifier* BuiltinNames::getPrivateName(const Identifier& ident) const
+{
+ auto iter = m_publicToPrivateMap.find(ident.impl());
+ if (iter != m_publicToPrivateMap.end())
+ return iter->value;
+ return 0;
+}
+
+inline const Identifier& BuiltinNames::getPublicName(const Identifier& ident) const
+{
+ auto iter = m_privateToPublicMap.find(ident.impl());
+ if (iter != m_privateToPublicMap.end())
+ return *iter->value;
+ return m_emptyIdentifier;
+}
+
+
+}
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -1594,7 +1594,7 @@
</span><span class="cx">
</span><span class="cx"> setConstantRegisters(unlinkedCodeBlock->constantRegisters());
</span><span class="cx"> if (unlinkedCodeBlock->usesGlobalObject())
</span><del>- m_constantRegisters[unlinkedCodeBlock->globalObjectRegister().offset()].set(*m_vm, ownerExecutable, m_globalObject.get());
</del><ins>+ m_constantRegisters[unlinkedCodeBlock->globalObjectRegister().toConstantIndex()].set(*m_vm, ownerExecutable, m_globalObject.get());
</ins><span class="cx"> m_functionDecls.resizeToFit(unlinkedCodeBlock->numberOfFunctionDecls());
</span><span class="cx"> for (size_t count = unlinkedCodeBlock->numberOfFunctionDecls(), i = 0; i < count; ++i) {
</span><span class="cx"> UnlinkedFunctionExecutable* unlinkedExecutable = unlinkedCodeBlock->functionDecl(i);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -49,9 +49,9 @@
</span><span class="cx"> const ClassInfo UnlinkedEvalCodeBlock::s_info = { "UnlinkedEvalCodeBlock", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(UnlinkedEvalCodeBlock) };
</span><span class="cx"> const ClassInfo UnlinkedFunctionCodeBlock::s_info = { "UnlinkedFunctionCodeBlock", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(UnlinkedFunctionCodeBlock) };
</span><span class="cx">
</span><del>-static UnlinkedFunctionCodeBlock* generateFunctionCodeBlock(VM& vm, UnlinkedFunctionExecutable* executable, const SourceCode& source, CodeSpecializationKind kind, DebuggerMode debuggerMode, ProfilerMode profilerMode, ParserError& error)
</del><ins>+static UnlinkedFunctionCodeBlock* generateFunctionCodeBlock(VM& vm, UnlinkedFunctionExecutable* executable, const SourceCode& source, CodeSpecializationKind kind, DebuggerMode debuggerMode, ProfilerMode profilerMode, UnlinkedFunctionKind functionKind, ParserError& error)
</ins><span class="cx"> {
</span><del>- RefPtr<FunctionBodyNode> body = parse<FunctionBodyNode>(&vm, source, executable->parameters(), executable->name(), executable->isInStrictContext() ? JSParseStrict : JSParseNormal, JSParseFunctionCode, error);
</del><ins>+ RefPtr<FunctionBodyNode> body = parse<FunctionBodyNode>(&vm, source, executable->parameters(), executable->name(), executable->toStrictness(), JSParseFunctionCode, error);
</ins><span class="cx">
</span><span class="cx"> if (!body) {
</span><span class="cx"> ASSERT(error.m_type != ParserError::ErrorNone);
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> body->finishParsing(executable->parameters(), executable->name(), executable->functionMode());
</span><span class="cx"> executable->recordParse(body->features(), body->hasCapturedVariables());
</span><span class="cx">
</span><del>- UnlinkedFunctionCodeBlock* result = UnlinkedFunctionCodeBlock::create(&vm, FunctionCode, ExecutableInfo(body->needsActivation(), body->usesEval(), body->isStrictMode(), kind == CodeForConstruct));
</del><ins>+ UnlinkedFunctionCodeBlock* result = UnlinkedFunctionCodeBlock::create(&vm, FunctionCode, ExecutableInfo(body->needsActivation(), body->usesEval(), body->isStrictMode(), kind == CodeForConstruct, functionKind == UnlinkedBuiltinFunction));
</ins><span class="cx"> OwnPtr<BytecodeGenerator> generator(adoptPtr(new BytecodeGenerator(vm, body.get(), result, debuggerMode, profilerMode)));
</span><span class="cx"> error = generator->generate();
</span><span class="cx"> body->destroyData();
</span><span class="lines">@@ -82,13 +82,14 @@
</span><span class="cx"> return addConstant(v);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-UnlinkedFunctionExecutable::UnlinkedFunctionExecutable(VM* vm, Structure* structure, const SourceCode& source, FunctionBodyNode* node, bool isFromGlobalCode)
</del><ins>+UnlinkedFunctionExecutable::UnlinkedFunctionExecutable(VM* vm, Structure* structure, const SourceCode& source, FunctionBodyNode* node, bool isFromGlobalCode, UnlinkedFunctionKind kind)
</ins><span class="cx"> : Base(*vm, structure)
</span><span class="cx"> , m_numCapturedVariables(node->capturedVariableCount())
</span><span class="cx"> , m_forceUsesArguments(node->usesArguments())
</span><span class="cx"> , m_isInStrictContext(node->isStrictMode())
</span><span class="cx"> , m_hasCapturedVariables(node->hasCapturedVariables())
</span><span class="cx"> , m_isFromGlobalCode(isFromGlobalCode)
</span><ins>+ , m_isBuiltinFunction(kind == UnlinkedBuiltinFunction)
</ins><span class="cx"> , m_name(node->ident())
</span><span class="cx"> , m_inferredName(node->inferredName())
</span><span class="cx"> , m_parameters(node->parameters())
</span><span class="lines">@@ -166,7 +167,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- UnlinkedFunctionCodeBlock* result = generateFunctionCodeBlock(vm, this, source, specializationKind, debuggerMode, profilerMode, error);
</del><ins>+ UnlinkedFunctionCodeBlock* result = generateFunctionCodeBlock(vm, this, source, specializationKind, debuggerMode, profilerMode, isBuiltinFunction() ? UnlinkedBuiltinFunction : UnlinkedNormalFunction, error);
</ins><span class="cx">
</span><span class="cx"> if (error.m_type != ParserError::ErrorNone)
</span><span class="cx"> return 0;
</span><span class="lines">@@ -210,6 +211,7 @@
</span><span class="cx"> , m_isStrictMode(info.m_isStrictMode)
</span><span class="cx"> , m_isConstructor(info.m_isConstructor)
</span><span class="cx"> , m_hasCapturedVariables(false)
</span><ins>+ , m_isBuiltinFunction(info.m_isBuiltinFunction)
</ins><span class="cx"> , m_firstLine(0)
</span><span class="cx"> , m_lineCount(0)
</span><span class="cx"> , m_endColumn(UINT_MAX)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -66,26 +66,35 @@
</span><span class="cx"> typedef unsigned UnlinkedLLIntCallLinkInfo;
</span><span class="cx">
</span><span class="cx"> struct ExecutableInfo {
</span><del>- ExecutableInfo(bool needsActivation, bool usesEval, bool isStrictMode, bool isConstructor)
</del><ins>+ ExecutableInfo(bool needsActivation, bool usesEval, bool isStrictMode, bool isConstructor, bool isBuiltinFunction)
</ins><span class="cx"> : m_needsActivation(needsActivation)
</span><span class="cx"> , m_usesEval(usesEval)
</span><span class="cx"> , m_isStrictMode(isStrictMode)
</span><span class="cx"> , m_isConstructor(isConstructor)
</span><ins>+ , m_isBuiltinFunction(isBuiltinFunction)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><del>- bool m_needsActivation;
- bool m_usesEval;
- bool m_isStrictMode;
- bool m_isConstructor;
</del><ins>+ bool m_needsActivation : 1;
+ bool m_usesEval : 1;
+ bool m_isStrictMode : 1;
+ bool m_isConstructor : 1;
+ bool m_isBuiltinFunction : 1;
</ins><span class="cx"> };
</span><span class="cx">
</span><ins>+enum UnlinkedFunctionKind {
+ UnlinkedNormalFunction,
+ UnlinkedBuiltinFunction,
+};
+
</ins><span class="cx"> class UnlinkedFunctionExecutable : public JSCell {
</span><span class="cx"> public:
</span><ins>+ friend class BuiltinExecutables;
</ins><span class="cx"> friend class CodeCache;
</span><ins>+ friend class VM;
</ins><span class="cx"> typedef JSCell Base;
</span><del>- static UnlinkedFunctionExecutable* create(VM* vm, const SourceCode& source, FunctionBodyNode* node, bool isFromGlobalCode = false)
</del><ins>+ static UnlinkedFunctionExecutable* create(VM* vm, const SourceCode& source, FunctionBodyNode* node, bool isFromGlobalCode, UnlinkedFunctionKind unlinkedFunctionKind)
</ins><span class="cx"> {
</span><del>- UnlinkedFunctionExecutable* instance = new (NotNull, allocateCell<UnlinkedFunctionExecutable>(vm->heap)) UnlinkedFunctionExecutable(vm, vm->unlinkedFunctionExecutableStructure.get(), source, node, isFromGlobalCode);
</del><ins>+ UnlinkedFunctionExecutable* instance = new (NotNull, allocateCell<UnlinkedFunctionExecutable>(vm->heap)) UnlinkedFunctionExecutable(vm, vm->unlinkedFunctionExecutableStructure.get(), source, node, isFromGlobalCode, unlinkedFunctionKind);
</ins><span class="cx"> instance->finishCreation(*vm);
</span><span class="cx"> return instance;
</span><span class="cx"> }
</span><span class="lines">@@ -100,6 +109,14 @@
</span><span class="cx"> size_t parameterCount() const;
</span><span class="cx"> bool isInStrictContext() const { return m_isInStrictContext; }
</span><span class="cx"> FunctionMode functionMode() const { return m_functionMode; }
</span><ins>+ JSParserStrictness toStrictness() const
+ {
+ if (m_isBuiltinFunction)
+ return JSParseBuiltin;
+ if (m_isInStrictContext)
+ return JSParseStrict;
+ return JSParseNormal;
+ }
</ins><span class="cx">
</span><span class="cx"> unsigned firstLineOffset() const { return m_firstLineOffset; }
</span><span class="cx"> unsigned lineCount() const { return m_lineCount; }
</span><span class="lines">@@ -142,8 +159,10 @@
</span><span class="cx"> static const bool hasImmortalStructure = true;
</span><span class="cx"> static void destroy(JSCell*);
</span><span class="cx">
</span><ins>+ bool isBuiltinFunction() const { return m_isBuiltinFunction; }
+
</ins><span class="cx"> private:
</span><del>- UnlinkedFunctionExecutable(VM*, Structure*, const SourceCode&, FunctionBodyNode*, bool isFromGlobalCode);
</del><ins>+ UnlinkedFunctionExecutable(VM*, Structure*, const SourceCode&, FunctionBodyNode*, bool isFromGlobalCode, UnlinkedFunctionKind);
</ins><span class="cx"> WriteBarrier<UnlinkedFunctionCodeBlock> m_codeBlockForCall;
</span><span class="cx"> WriteBarrier<UnlinkedFunctionCodeBlock> m_codeBlockForConstruct;
</span><span class="cx">
</span><span class="lines">@@ -152,6 +171,7 @@
</span><span class="cx"> bool m_isInStrictContext : 1;
</span><span class="cx"> bool m_hasCapturedVariables : 1;
</span><span class="cx"> bool m_isFromGlobalCode : 1;
</span><ins>+ bool m_isBuiltinFunction : 1;
</ins><span class="cx">
</span><span class="cx"> Identifier m_name;
</span><span class="cx"> Identifier m_inferredName;
</span><span class="lines">@@ -318,6 +338,8 @@
</span><span class="cx"> void setIsNumericCompareFunction(bool isNumericCompareFunction) { m_isNumericCompareFunction = isNumericCompareFunction; }
</span><span class="cx"> bool isNumericCompareFunction() const { return m_isNumericCompareFunction; }
</span><span class="cx">
</span><ins>+ bool isBuiltinFunction() const { return m_isBuiltinFunction; }
+
</ins><span class="cx"> void shrinkToFit()
</span><span class="cx"> {
</span><span class="cx"> m_jumpTargets.shrinkToFit();
</span><span class="lines">@@ -500,6 +522,7 @@
</span><span class="cx"> bool m_isStrictMode : 1;
</span><span class="cx"> bool m_isConstructor : 1;
</span><span class="cx"> bool m_hasCapturedVariables : 1;
</span><ins>+ bool m_isBuiltinFunction : 1;
</ins><span class="cx"> unsigned m_firstLine;
</span><span class="cx"> unsigned m_lineCount;
</span><span class="cx"> unsigned m_endColumn;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -182,6 +182,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> , m_usesExceptions(false)
</span><span class="cx"> , m_expressionTooDeep(false)
</span><ins>+ , m_isBuiltinFunction(false)
</ins><span class="cx"> {
</span><span class="cx"> m_codeBlock->setNumParameters(1); // Allocate space for "this"
</span><span class="cx">
</span><span class="lines">@@ -225,7 +226,13 @@
</span><span class="cx"> #endif
</span><span class="cx"> , m_usesExceptions(false)
</span><span class="cx"> , m_expressionTooDeep(false)
</span><ins>+ , m_isBuiltinFunction(codeBlock->isBuiltinFunction())
</ins><span class="cx"> {
</span><ins>+ if (m_isBuiltinFunction) {
+ m_shouldEmitProfileHooks = false;
+ m_shouldEmitDebugHooks = false;
+ }
+
</ins><span class="cx"> m_symbolTable->setUsesNonStrictEval(codeBlock->usesEval() && !codeBlock->isStrictMode());
</span><span class="cx"> Vector<Identifier> boundParameterProperties;
</span><span class="cx"> FunctionParameters& parameters = *functionBody->parameters();
</span><span class="lines">@@ -433,6 +440,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> , m_usesExceptions(false)
</span><span class="cx"> , m_expressionTooDeep(false)
</span><ins>+ , m_isBuiltinFunction(false)
</ins><span class="cx"> {
</span><span class="cx"> m_symbolTable->setUsesNonStrictEval(codeBlock->usesEval() && !codeBlock->isStrictMode());
</span><span class="cx"> m_codeBlock->setNumParameters(1);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -462,7 +462,9 @@
</span><span class="cx"> bool shouldEmitDebugHooks() { return m_shouldEmitDebugHooks; }
</span><span class="cx">
</span><span class="cx"> bool isStrictMode() const { return m_codeBlock->isStrictMode(); }
</span><del>-
</del><ins>+
+ bool isBuiltinFunction() const { return m_isBuiltinFunction; }
+
</ins><span class="cx"> private:
</span><span class="cx"> friend class Label;
</span><span class="cx">
</span><span class="lines">@@ -544,7 +546,7 @@
</span><span class="cx">
</span><span class="cx"> UnlinkedFunctionExecutable* makeFunction(FunctionBodyNode* body)
</span><span class="cx"> {
</span><del>- return UnlinkedFunctionExecutable::create(m_vm, m_scopeNode->source(), body);
</del><ins>+ return UnlinkedFunctionExecutable::create(m_vm, m_scopeNode->source(), body, false, isBuiltinFunction() ? UnlinkedBuiltinFunction : UnlinkedNormalFunction);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RegisterID* emitInitLazyRegister(RegisterID*);
</span><span class="lines">@@ -678,6 +680,7 @@
</span><span class="cx">
</span><span class="cx"> bool m_usesExceptions;
</span><span class="cx"> bool m_expressionTooDeep;
</span><ins>+ bool m_isBuiltinFunction;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerNodesCodegencpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -535,9 +535,12 @@
</span><span class="cx"> RefPtr<Label> end = generator.newLabel();
</span><span class="cx"> RefPtr<RegisterID> base = generator.emitNode(m_base);
</span><span class="cx"> generator.emitExpressionInfo(subexpressionDivot(), subexpressionStart(), subexpressionEnd());
</span><del>- RefPtr<RegisterID> function = generator.emitGetById(generator.tempDestination(dst), base.get(), m_ident);
</del><ins>+ RefPtr<RegisterID> function = generator.emitGetById(generator.tempDestination(dst), base.get(), generator.propertyNames().call);
</ins><span class="cx"> RefPtr<RegisterID> returnValue = generator.finalDestination(dst, function.get());
</span><del>- generator.emitJumpIfNotFunctionCall(function.get(), realCall.get());
</del><ins>+ bool emitCallCheck = !generator.isBuiltinFunction();
+ if (emitCallCheck)
+ generator.emitJumpIfNotFunctionCall(function.get(), realCall.get());
+
</ins><span class="cx"> {
</span><span class="cx"> if (m_args->m_listNode && m_args->m_listNode->m_expr) {
</span><span class="cx"> ArgumentListNode* oldList = m_args->m_listNode;
</span><span class="lines">@@ -547,24 +550,24 @@
</span><span class="cx"> CallArguments callArguments(generator, m_args);
</span><span class="cx"> generator.emitNode(callArguments.thisRegister(), oldList->m_expr);
</span><span class="cx"> generator.emitCall(returnValue.get(), realFunction.get(), NoExpectedFunction, callArguments, divot(), divotStart(), divotEnd());
</span><del>- generator.emitJump(end.get());
-
</del><span class="cx"> m_args->m_listNode = oldList;
</span><span class="cx"> } else {
</span><span class="cx"> RefPtr<RegisterID> realFunction = generator.emitMove(generator.tempDestination(dst), base.get());
</span><span class="cx"> CallArguments callArguments(generator, m_args);
</span><span class="cx"> generator.emitLoad(callArguments.thisRegister(), jsUndefined());
</span><span class="cx"> generator.emitCall(returnValue.get(), realFunction.get(), NoExpectedFunction, callArguments, divot(), divotStart(), divotEnd());
</span><del>- generator.emitJump(end.get());
</del><span class="cx"> }
</span><span class="cx"> }
</span><del>- generator.emitLabel(realCall.get());
- {
- CallArguments callArguments(generator, m_args);
- generator.emitMove(callArguments.thisRegister(), base.get());
- generator.emitCall(returnValue.get(), function.get(), NoExpectedFunction, callArguments, divot(), divotStart(), divotEnd());
</del><ins>+ if (emitCallCheck) {
+ generator.emitJump(end.get());
+ generator.emitLabel(realCall.get());
+ {
+ CallArguments callArguments(generator, m_args);
+ generator.emitMove(callArguments.thisRegister(), base.get());
+ generator.emitCall(returnValue.get(), function.get(), NoExpectedFunction, callArguments, divot(), divotStart(), divotEnd());
+ }
+ generator.emitLabel(end.get());
</ins><span class="cx"> }
</span><del>- generator.emitLabel(end.get());
</del><span class="cx"> return returnValue.get();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -585,65 +588,67 @@
</span><span class="cx"> RefPtr<Label> end = generator.newLabel();
</span><span class="cx"> RefPtr<RegisterID> base = generator.emitNode(m_base);
</span><span class="cx"> generator.emitExpressionInfo(subexpressionDivot(), subexpressionStart(), subexpressionEnd());
</span><del>- RefPtr<RegisterID> function = generator.emitGetById(generator.tempDestination(dst), base.get(), m_ident);
</del><ins>+ RefPtr<RegisterID> function;
</ins><span class="cx"> RefPtr<RegisterID> returnValue = generator.finalDestination(dst, function.get());
</span><del>- generator.emitJumpIfNotFunctionApply(function.get(), realCall.get());
- {
- if (mayBeCall) {
- if (m_args->m_listNode && m_args->m_listNode->m_expr) {
- ArgumentListNode* oldList = m_args->m_listNode;
- if (m_args->m_listNode->m_next) {
- ASSERT(m_args->m_listNode->m_next->m_expr->isSimpleArray());
- ASSERT(!m_args->m_listNode->m_next->m_next);
- m_args->m_listNode = static_cast<ArrayNode*>(m_args->m_listNode->m_next->m_expr)->toArgumentList(generator.vm(), 0, 0);
- RefPtr<RegisterID> realFunction = generator.emitMove(generator.tempDestination(dst), base.get());
- CallArguments callArguments(generator, m_args);
- generator.emitNode(callArguments.thisRegister(), oldList->m_expr);
- generator.emitCall(returnValue.get(), realFunction.get(), NoExpectedFunction, callArguments, divot(), divotStart(), divotEnd());
- } else {
- m_args->m_listNode = m_args->m_listNode->m_next;
- RefPtr<RegisterID> realFunction = generator.emitMove(generator.tempDestination(dst), base.get());
- CallArguments callArguments(generator, m_args);
- generator.emitNode(callArguments.thisRegister(), oldList->m_expr);
- generator.emitCall(returnValue.get(), realFunction.get(), NoExpectedFunction, callArguments, divot(), divotStart(), divotEnd());
- }
- m_args->m_listNode = oldList;
</del><ins>+ bool emitCallCheck = !generator.isBuiltinFunction();
+ if (emitCallCheck) {
+ function = generator.emitGetById(generator.tempDestination(dst), base.get(), generator.propertyNames().apply);
+ generator.emitJumpIfNotFunctionApply(function.get(), realCall.get());
+ }
+ if (mayBeCall) {
+ if (m_args->m_listNode && m_args->m_listNode->m_expr) {
+ ArgumentListNode* oldList = m_args->m_listNode;
+ if (m_args->m_listNode->m_next) {
+ ASSERT(m_args->m_listNode->m_next->m_expr->isSimpleArray());
+ ASSERT(!m_args->m_listNode->m_next->m_next);
+ m_args->m_listNode = static_cast<ArrayNode*>(m_args->m_listNode->m_next->m_expr)->toArgumentList(generator.vm(), 0, 0);
+ RefPtr<RegisterID> realFunction = generator.emitMove(generator.tempDestination(dst), base.get());
+ CallArguments callArguments(generator, m_args);
+ generator.emitNode(callArguments.thisRegister(), oldList->m_expr);
+ generator.emitCall(returnValue.get(), realFunction.get(), NoExpectedFunction, callArguments, divot(), divotStart(), divotEnd());
</ins><span class="cx"> } else {
</span><ins>+ m_args->m_listNode = m_args->m_listNode->m_next;
</ins><span class="cx"> RefPtr<RegisterID> realFunction = generator.emitMove(generator.tempDestination(dst), base.get());
</span><span class="cx"> CallArguments callArguments(generator, m_args);
</span><del>- generator.emitLoad(callArguments.thisRegister(), jsUndefined());
</del><ins>+ generator.emitNode(callArguments.thisRegister(), oldList->m_expr);
</ins><span class="cx"> generator.emitCall(returnValue.get(), realFunction.get(), NoExpectedFunction, callArguments, divot(), divotStart(), divotEnd());
</span><span class="cx"> }
</span><ins>+ m_args->m_listNode = oldList;
</ins><span class="cx"> } else {
</span><del>- ASSERT(m_args->m_listNode && m_args->m_listNode->m_next);
- RefPtr<RegisterID> profileHookRegister;
- if (generator.shouldEmitProfileHooks())
- profileHookRegister = generator.newTemporary();
</del><span class="cx"> RefPtr<RegisterID> realFunction = generator.emitMove(generator.tempDestination(dst), base.get());
</span><del>- RefPtr<RegisterID> thisRegister = generator.emitNode(m_args->m_listNode->m_expr);
- RefPtr<RegisterID> argsRegister;
- ArgumentListNode* args = m_args->m_listNode->m_next;
- if (args->m_expr->isResolveNode() && generator.willResolveToArguments(static_cast<ResolveNode*>(args->m_expr)->identifier()))
- argsRegister = generator.uncheckedRegisterForArguments();
- else
- argsRegister = generator.emitNode(args->m_expr);
</del><ins>+ CallArguments callArguments(generator, m_args);
+ generator.emitLoad(callArguments.thisRegister(), jsUndefined());
+ generator.emitCall(returnValue.get(), realFunction.get(), NoExpectedFunction, callArguments, divot(), divotStart(), divotEnd());
+ }
+ } else {
+ ASSERT(m_args->m_listNode && m_args->m_listNode->m_next);
+ RefPtr<RegisterID> profileHookRegister;
+ if (generator.shouldEmitProfileHooks())
+ profileHookRegister = generator.newTemporary();
+ RefPtr<RegisterID> realFunction = generator.emitMove(generator.tempDestination(dst), base.get());
+ RefPtr<RegisterID> thisRegister = generator.emitNode(m_args->m_listNode->m_expr);
+ RefPtr<RegisterID> argsRegister;
+ ArgumentListNode* args = m_args->m_listNode->m_next;
+ if (args->m_expr->isResolveNode() && generator.willResolveToArguments(static_cast<ResolveNode*>(args->m_expr)->identifier()))
+ argsRegister = generator.uncheckedRegisterForArguments();
+ else
+ argsRegister = generator.emitNode(args->m_expr);
</ins><span class="cx">
</span><del>- // Function.prototype.apply ignores extra arguments, but we still
- // need to evaluate them for side effects.
- while ((args = args->m_next))
- generator.emitNode(args->m_expr);
</del><ins>+ // Function.prototype.apply ignores extra arguments, but we still
+ // need to evaluate them for side effects.
+ while ((args = args->m_next))
+ generator.emitNode(args->m_expr);
</ins><span class="cx">
</span><del>- generator.emitCallVarargs(returnValue.get(), realFunction.get(), thisRegister.get(), argsRegister.get(), generator.newTemporary(), profileHookRegister.get(), divot(), divotStart(), divotEnd());
- }
</del><ins>+ generator.emitCallVarargs(returnValue.get(), realFunction.get(), thisRegister.get(), argsRegister.get(), generator.newTemporary(), profileHookRegister.get(), divot(), divotStart(), divotEnd());
+ }
+ if (emitCallCheck) {
</ins><span class="cx"> generator.emitJump(end.get());
</span><del>- }
- generator.emitLabel(realCall.get());
- {
</del><ins>+ generator.emitLabel(realCall.get());
</ins><span class="cx"> CallArguments callArguments(generator, m_args);
</span><span class="cx"> generator.emitMove(callArguments.thisRegister(), base.get());
</span><span class="cx"> generator.emitCall(returnValue.get(), function.get(), NoExpectedFunction, callArguments, divot(), divotStart(), divotEnd());
</span><ins>+ generator.emitLabel(end.get());
</ins><span class="cx"> }
</span><del>- generator.emitLabel(end.get());
</del><span class="cx"> return returnValue.get();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorecreate_hash_table"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/create_hash_table (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/create_hash_table 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/create_hash_table 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -248,7 +248,9 @@
</span><span class="cx"> my $nameEntries = "${name}Values";
</span><span class="cx"> $nameEntries =~ s/:/_/g;
</span><span class="cx">
</span><ins>+ print "\n#include \"JSCBuiltins.h\"\n";
</ins><span class="cx"> print "\n#include \"Lookup.h\"\n" if ($includelookup);
</span><ins>+
</ins><span class="cx"> if ($useNameSpace) {
</span><span class="cx"> print "\nnamespace ${useNameSpace} {\n";
</span><span class="cx"> print "\nusing namespace JSC;\n";
</span><span class="lines">@@ -289,7 +291,17 @@
</span><span class="cx"> $intrinsic = "RegExpTestIntrinsic" if ($key eq "test");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ($values[$i]{"type"} eq "Function") {
+ my $tableHead = $name;
+ $tableHead =~ s/Table$//;
+ print " #if JSC_BUILTIN_EXISTS(" . uc($tableHead . $key) .")\n";
+ print " { \"$key\", (($attrs[$i]) & ~Function) | Builtin, $intrinsic, (intptr_t)static_cast<BuiltinGenerator>(" . $tableHead . ucfirst($key) . "CodeGenerator), (intptr_t)$secondValue },\n";
+ print " #else\n"
+ }
</ins><span class="cx"> print " { \"$key\", $attrs[$i], $intrinsic, (intptr_t)" . $firstCastStr . "($firstValue), (intptr_t)" . $secondCastStr . "($secondValue) },\n";
</span><ins>+ if ($values[$i]{"type"} eq "Function") {
+ print " #endif\n"
+ }
</ins><span class="cx"> $i++;
</span><span class="cx"> }
</span><span class="cx"> print " { 0, 0, NoIntrinsic, 0, 0 }\n";
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoregeneratejsbuiltins"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/generate-js-builtins (0 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/generate-js-builtins (rev 0)
+++ trunk/Source/JavaScriptCore/generate-js-builtins 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -0,0 +1,304 @@
</span><ins>+#!/usr/bin/python
+# Copyright (C) 2014 Apple Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import filecmp
+import fnmatch
+import os
+import re
+import shutil
+import sys
+import datetime
+import json
+
+copyrightText = """ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */\n
+"""
+
+generatorString = "/* Generated by %s do not hand edit. */\n" % os.path.basename(__file__)
+
+functionHeadRegExp = re.compile(r"function\s+\w+\s*\(.*?\)", re.MULTILINE | re.S)
+functionNameRegExp = re.compile(r"function\s+(\w+)\s*\(", re.MULTILINE | re.S)
+functionParameterFinder = re.compile(r"^function\s+(?:\w+)\s*\(((?:\s*\w+)?\s*(?:\s*,\s*\w+)*)?\)", re.MULTILINE | re.S)
+
+multilineCommentRegExp = re.compile(r"\/\*.*?\*\/", re.MULTILINE | re.S)
+singleLineCommentRegExp = re.compile(r"\/\/.*?\n", re.MULTILINE | re.S)
+
+def getCopyright(source):
+ copyrightBlock = multilineCommentRegExp.findall(source)[0]
+ copyrightBlock = copyrightBlock[:copyrightBlock.index("Redistribution")]
+ copyRightLines = []
+
+ for line in copyrightBlock.split("\n"):
+ line = line.replace("/*", "")
+ line = line.replace("*/", "")
+ line = line.replace("*", "")
+ line = line.replace("Copyright", "")
+ line = line.replace("copyright", "")
+ line = line.replace("(C)", "")
+ line = line.replace("(c)", "")
+ line = line.strip()
+ if len(line) == 0:
+ continue
+
+ copyRightLines.append(line)
+
+ return list(set(copyRightLines))
+
+
+
+def getFunctions(source):
+
+ source = multilineCommentRegExp.sub("/**/", singleLineCommentRegExp.sub("//\n", source))
+
+ matches = [ f for f in functionHeadRegExp.finditer(source)]
+ functionBounds = []
+ start = 0
+ end = 0
+ for match in matches:
+ start = match.start()
+ if start < end:
+ continue
+ end = match.end()
+ while source[end] != '{':
+ end = end + 1
+ depth = 1
+ end = end + 1
+ while depth > 0:
+ if source[end] == '{':
+ depth = depth + 1
+ elif source[end] == '}':
+ depth = depth - 1
+ end = end + 1
+ functionBounds.append((start, end))
+
+ functions = [source[start:end].strip() for (start, end) in functionBounds]
+ result = []
+ for function in functions:
+ function = multilineCommentRegExp.sub("", function)
+ functionName = functionNameRegExp.findall(function)[0]
+ functionParameters = functionParameterFinder.findall(function)[0].split(',')
+ if len(functionParameters[0]) == 0:
+ functionParameters = []
+
+ result.append((functionName, function, functionParameters))
+ return result
+
+
+def generateCode(source):
+ inputFile = open(source, "r")
+ baseName = os.path.basename(source).replace(".js", "")
+
+ source = ""
+ for line in inputFile:
+ source = source + line
+
+ if sys.platform == "cygwin":
+ source = source.replace("\r\n", "\n")
+ return (baseName, getFunctions(source), getCopyright(source))
+
+def mangleName(object, name):
+ qName = object + "." + name
+ mangledName = ""
+ i = 0
+ while i < len(qName):
+ if qName[i] == '.':
+ mangledName = mangledName + qName[i + 1].upper()
+ i = i + 1
+ else:
+ mangledName = mangledName + qName[i]
+ i = i + 1
+ return mangledName
+
+builtins = []
+
+baseName = sys.argv[-1]
+builtin_definitions = sys.argv[1:-1]
+(output_base, _) = os.path.splitext(sys.argv[-1])
+
+copyrights = []
+for file in builtin_definitions:
+ if fnmatch.fnmatch(file, '*.js'):
+ (baseName, functions, objectCopyrights) = generateCode(file)
+ copyrights.extend(objectCopyrights)
+ builtins.append((baseName, functions))
+
+copyrights = list(set(copyrights))
+
+copyrightBody = ""
+for copyright in copyrights:
+ copyrightBody = copyrightBody +" * Copyright (C) " + copyright + "\n"
+
+builtinsHeader = open(output_base + ".h.tmp", "w")
+builtinsImplementation = open(output_base + ".cpp.tmp", "w")
+copyrightText = "/*\n" + copyrightBody + copyrightText
+builtinsHeader.write("""%s
+%s
+
+#ifndef JSCBuiltins_H
+#define JSCBuiltins_H
+
+namespace JSC {
+
+class FunctionExecutable;
+class Identifier;
+class JSGlobalObject;
+class SourceCode;
+class UnlinkedFunctionExecutable;
+class VM;
+
+FunctionExecutable* createBuiltinExecutable(VM&, UnlinkedFunctionExecutable*, const SourceCode&);
+
+""" % (generatorString, copyrightText))
+
+codeReferences = []
+
+for (objectName, functions) in builtins:
+ print("Generating bindings for the %s builtin." % objectName)
+ builtinsHeader.write("/* %s functions */\n" % objectName)
+ for (name, implementation, _) in functions:
+ mangledName = mangleName(objectName, name)
+ mangledName = mangledName[0].lower() + mangledName[1:] + "Code"
+ codeReferences.append((mangledName, name, implementation))
+ builtinsHeader.write("extern const char* s_%s;\n" % mangledName)
+ builtinsHeader.write("extern const int s_%sLength;\n" % mangledName)
+ builtinsHeader.write("\n")
+ builtinsHeader.write("#define JSC_FOREACH_%s_BUILTIN(macro) \\\n" % objectName.replace(".", "_").upper())
+ for (name, implementation, arguments) in functions:
+ mangledName = mangleName(objectName, name)
+ builtinsHeader.write(" macro(%s, %s, %d) \\\n" % (name, mangledName, len(arguments)))
+ builtinsHeader.write("\n")
+ for (name, implementation, arguments) in functions:
+ builtinsHeader.write("#define JSC_BUILTIN_%s 1\n" % mangleName(objectName, name).upper())
+ builtinsHeader.write("\n\n")
+names = []
+builtinsHeader.write("#define JSC_FOREACH_BUILTIN(macro)\\\n")
+for (codeReference, functionName, source) in codeReferences:
+ builtinsHeader.write(" macro(%s, %s, s_%sLength) \\\n" % (codeReference, functionName, codeReference))
+ names.append(functionName)
+
+builtinsHeader.write("\n\n")
+builtinsHeader.write("#define JSC_FOREACH_BUILTIN_FUNCTION_NAME(macro) \\\n")
+for name in sorted(set(names)):
+ builtinsHeader.write(" macro(%s) \\\n" % name)
+builtinsHeader.write("""
+
+#define JSC_DECLARE_BUILTIN_GENERATOR(codeName, functionName, argumentCount) \\
+ FunctionExecutable* codeName##Generator(VM&);
+
+JSC_FOREACH_BUILTIN(JSC_DECLARE_BUILTIN_GENERATOR)
+#undef JSC_DECLARE_BUILTIN_GENERATOR
+
+#define JSC_BUILTIN_EXISTS(name) defined JSC_BUILTIN_ ## name
+
+}
+
+#endif
+
+""")
+
+builtinsImplementation.write("""%s
+%s
+
+#include "config.h"
+
+#include "JSCBuiltins.h"
+
+#include "BuiltinExecutables.h"
+#include "Executable.h"
+#include "JSCellInlines.h"
+#include "VM.h"
+
+namespace JSC {
+
+""" % (generatorString, copyrightText))
+
+for (codeReference, name, source) in codeReferences:
+ source = "(function " + source[source.index("("):] + ")"
+ lines = json.dumps(source)[1:-1].split("\\n")
+ sourceLength = len(source)
+ source = ""
+ for line in lines:
+ source = source + (" \"%s\\n\" \\\n" % line)
+ builtinsImplementation.write("const char* s_%s =\n%s;\n\n" % (codeReference, source))
+ builtinsImplementation.write("const int s_%sLength = %d;\n\n" % (codeReference, sourceLength + 1)) # + 1 for \n
+
+builtinsImplementation.write("""
+FunctionExecutable* createBuiltinExecutable(VM& vm, UnlinkedFunctionExecutable* unlinkedExecutable, const SourceCode& source)
+{
+ unsigned lineCount = unlinkedExecutable->lineCount();
+ unsigned startColumn = 1;
+ unsigned sourceLength = unlinkedExecutable->sourceLength();
+ bool endColumnIsOnStartLine = !lineCount;
+ unsigned endColumnExcludingBraces = unlinkedExecutable->unlinkedBodyEndColumn() + (endColumnIsOnStartLine ? 0 : 1);
+ unsigned startOffset = unlinkedExecutable->startOffset();
+ unsigned startOffsetExcludingOpenBrace = startOffset + 1;
+ unsigned endOffsetExcludingCloseBrace = startOffset + sourceLength - 1;
+ SourceCode bodySource(source.provider(), startOffsetExcludingOpenBrace, endOffsetExcludingCloseBrace, 0, startColumn);
+ return FunctionExecutable::create(vm, bodySource, unlinkedExecutable, 0, lineCount, startColumn, endColumnExcludingBraces, false);
+}
+
+#define JSC_DEFINE_BUILTIN_GENERATOR(codeName, functionName, argumentCount) \\
+FunctionExecutable* codeName##Generator(VM& vm) \\
+{ \\
+ return createBuiltinExecutable(vm, vm.builtinExecutables()->codeName##Executable(), vm.builtinExecutables()->codeName##Source()); \\
+}
+
+JSC_FOREACH_BUILTIN(JSC_DEFINE_BUILTIN_GENERATOR)
+#undef JSC_DEFINE_BUILTIN_GENERATOR
+}
+
+""")
+
+builtinsHeader.close()
+builtinsImplementation.close()
+
+if (not os.path.exists(output_base + ".h")) or (not filecmp.cmp(output_base + ".h.tmp", output_base + ".h", shallow=False)):
+ os.rename(output_base + ".h.tmp", output_base + ".h")
+else:
+ os.remove(output_base + ".h.tmp")
+
+if (not os.path.exists(output_base + ".cpp")) or (not filecmp.cmp(output_base + ".cpp.tmp", output_base + ".cpp", shallow=False)):
+ os.rename(output_base + ".cpp.tmp", output_base + ".cpp")
+else:
+ os.remove(output_base + ".cpp.tmp")
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterCachedCallh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/CachedCall.h (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/CachedCall.h 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/interpreter/CachedCall.h 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> , m_interpreter(callFrame->interpreter())
</span><span class="cx"> , m_entryScope(callFrame->vm(), function->scope()->globalObject())
</span><span class="cx"> {
</span><del>- ASSERT(!function->isHostFunction());
</del><ins>+ ASSERT(!function->isHostFunctionNonInline());
</ins><span class="cx"> if (callFrame->vm().isSafeToRecurse()) {
</span><span class="cx"> m_arguments.resize(argumentCount);
</span><span class="cx"> m_closure = m_interpreter->prepareForRepeatCall(function->jsExecutable(), callFrame, &m_protoCallFrame, function, argumentCount + 1, function->scope(), m_arguments.data());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserASTBuilderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/ASTBuilder.h (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/ASTBuilder.h 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/parser/ASTBuilder.h 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -888,9 +888,9 @@
</span><span class="cx"> ASSERT(func->isDotAccessorNode());
</span><span class="cx"> DotAccessorNode* dot = static_cast<DotAccessorNode*>(func);
</span><span class="cx"> FunctionCallDotNode* node;
</span><del>- if (dot->identifier() == m_vm->propertyNames->call)
</del><ins>+ if (dot->identifier() == m_vm->propertyNames->call || dot->identifier() == m_vm->propertyNames->callPrivateName)
</ins><span class="cx"> node = new (m_vm) CallFunctionCallDotNode(location, dot->base(), dot->identifier(), args, divot, divotStart, divotEnd);
</span><del>- else if (dot->identifier() == m_vm->propertyNames->apply)
</del><ins>+ else if (dot->identifier() == m_vm->propertyNames->apply || dot->identifier() == m_vm->propertyNames->applyPrivateName)
</ins><span class="cx"> node = new (m_vm) ApplyFunctionCallDotNode(location, dot->base(), dot->identifier(), args, divot, divotStart, divotEnd);
</span><span class="cx"> else
</span><span class="cx"> node = new (m_vm) FunctionCallDotNode(location, dot->base(), dot->identifier(), args, divot, divotStart, divotEnd);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserLexercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Lexer.cpp (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Lexer.cpp 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/parser/Lexer.cpp 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -91,6 +91,7 @@
</span><span class="cx">
</span><span class="cx"> // Other types (only one so far)
</span><span class="cx"> CharacterWhiteSpace,
</span><ins>+ CharacterPrivateIdentifierStart
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // 256 Latin-1 codes
</span><span class="lines">@@ -159,7 +160,7 @@
</span><span class="cx"> /* 61 - = */ CharacterEqual,
</span><span class="cx"> /* 62 - > */ CharacterGreater,
</span><span class="cx"> /* 63 - ? */ CharacterQuestion,
</span><del>-/* 64 - @ */ CharacterInvalid,
</del><ins>+/* 64 - @ */ CharacterPrivateIdentifierStart,
</ins><span class="cx"> /* 65 - A */ CharacterIdentifierStart,
</span><span class="cx"> /* 66 - B */ CharacterIdentifierStart,
</span><span class="cx"> /* 67 - C */ CharacterIdentifierStart,
</span><span class="lines">@@ -487,9 +488,10 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template <typename T>
</span><del>-Lexer<T>::Lexer(VM* vm)
</del><ins>+Lexer<T>::Lexer(VM* vm, JSParserStrictness strictness)
</ins><span class="cx"> : m_isReparsing(false)
</span><span class="cx"> , m_vm(vm)
</span><ins>+ , m_parsingBuiltinFunction(strictness == JSParseBuiltin)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -754,7 +756,27 @@
</span><span class="cx"> ASSERT(c <= static_cast<int>(USHRT_MAX));
</span><span class="cx"> m_buffer16.append(static_cast<UChar>(c));
</span><span class="cx"> }
</span><del>-
</del><ins>+
+#if !ASSERT_DISABLED
+bool isSafeBuiltinIdentifier(VM& vm, const Identifier* ident)
+{
+ if (!ident)
+ return true;
+ /* Just block any use of suspicious identifiers. This is intended to
+ * be used as a safety net while implementing builtins.
+ */
+ if (*ident == vm.propertyNames->call)
+ return false;
+ if (*ident == vm.propertyNames->apply)
+ return false;
+ if (*ident == vm.propertyNames->eval)
+ return false;
+ if (*ident == vm.propertyNames->Function)
+ return false;
+ return true;
+}
+#endif
+
</ins><span class="cx"> template <>
</span><span class="cx"> template <bool shouldCreateIdentifier> ALWAYS_INLINE JSTokenType Lexer<LChar>::parseIdentifier(JSTokenData* tokenData, unsigned lexerFlags, bool strictMode)
</span><span class="cx"> {
</span><span class="lines">@@ -766,7 +788,11 @@
</span><span class="cx"> return keyword == RESERVED_IF_STRICT && !strictMode ? IDENT : keyword;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
+ bool isPrivateName = m_current == '@' && m_parsingBuiltinFunction;
+ if (isPrivateName)
+ shift();
+
</ins><span class="cx"> const LChar* identifierStart = currentSourcePtr();
</span><span class="cx"> unsigned identifierLineStart = currentLineStartOffset();
</span><span class="cx">
</span><span class="lines">@@ -780,15 +806,26 @@
</span><span class="cx">
</span><span class="cx"> const Identifier* ident = 0;
</span><span class="cx">
</span><del>- if (shouldCreateIdentifier) {
</del><ins>+ if (shouldCreateIdentifier || m_parsingBuiltinFunction) {
</ins><span class="cx"> int identifierLength = currentSourcePtr() - identifierStart;
</span><span class="cx"> ident = makeIdentifier(identifierStart, identifierLength);
</span><del>-
</del><ins>+ if (m_parsingBuiltinFunction) {
+ if (!isSafeBuiltinIdentifier(*m_vm, ident) && !isPrivateName) {
+ m_lexErrorMessage = makeString("The use of '", ident->string(), "' is disallowed in builtin functions.");
+ return ERRORTOK;
+ }
+ if (isPrivateName)
+ ident = m_vm->propertyNames->getPrivateName(*ident);
+ else if (*ident == m_vm->propertyNames->undefinedKeyword)
+ tokenData->ident = &m_vm->propertyNames->undefinedPrivateName;
+ if (!ident)
+ return INVALID_PRIVATE_NAME_ERRORTOK;
+ }
</ins><span class="cx"> tokenData->ident = ident;
</span><span class="cx"> } else
</span><span class="cx"> tokenData->ident = 0;
</span><span class="cx">
</span><del>- if (UNLIKELY((remaining < maxTokenLength) && !(lexerFlags & LexerFlagsIgnoreReservedWords))) {
</del><ins>+ if (UNLIKELY((remaining < maxTokenLength) && !(lexerFlags & LexerFlagsIgnoreReservedWords)) && !isPrivateName) {
</ins><span class="cx"> ASSERT(shouldCreateIdentifier);
</span><span class="cx"> if (remaining < maxTokenLength) {
</span><span class="cx"> const HashEntry* entry = m_vm->keywords->getKeyword(*ident);
</span><span class="lines">@@ -815,6 +852,10 @@
</span><span class="cx"> return keyword == RESERVED_IF_STRICT && !strictMode ? IDENT : keyword;
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ bool isPrivateName = m_current == '@' && m_parsingBuiltinFunction;
+ if (isPrivateName)
+ shift();
</ins><span class="cx">
</span><span class="cx"> const UChar* identifierStart = currentSourcePtr();
</span><span class="cx"> int identifierLineStart = currentLineStartOffset();
</span><span class="lines">@@ -827,6 +868,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (UNLIKELY(m_current == '\\')) {
</span><ins>+ ASSERT(!isPrivateName);
</ins><span class="cx"> setOffsetFromSourcePtr(identifierStart, identifierLineStart);
</span><span class="cx"> return parseIdentifierSlowCase<shouldCreateIdentifier>(tokenData, lexerFlags, strictMode);
</span><span class="cx"> }
</span><span class="lines">@@ -838,18 +880,29 @@
</span><span class="cx">
</span><span class="cx"> const Identifier* ident = 0;
</span><span class="cx">
</span><del>- if (shouldCreateIdentifier) {
</del><ins>+ if (shouldCreateIdentifier || m_parsingBuiltinFunction) {
</ins><span class="cx"> int identifierLength = currentSourcePtr() - identifierStart;
</span><span class="cx"> if (isAll8Bit)
</span><span class="cx"> ident = makeIdentifierLCharFromUChar(identifierStart, identifierLength);
</span><span class="cx"> else
</span><span class="cx"> ident = makeIdentifier(identifierStart, identifierLength);
</span><del>-
</del><ins>+ if (m_parsingBuiltinFunction) {
+ if (!isSafeBuiltinIdentifier(*m_vm, ident) && !isPrivateName) {
+ m_lexErrorMessage = makeString("The use of '", ident->string(), "' is disallowed in builtin functions.");
+ return ERRORTOK;
+ }
+ if (isPrivateName)
+ ident = m_vm->propertyNames->getPrivateName(*ident);
+ else if (*ident == m_vm->propertyNames->undefinedKeyword)
+ tokenData->ident = &m_vm->propertyNames->undefinedPrivateName;
+ if (!ident)
+ return INVALID_PRIVATE_NAME_ERRORTOK;
+ }
</ins><span class="cx"> tokenData->ident = ident;
</span><span class="cx"> } else
</span><span class="cx"> tokenData->ident = 0;
</span><span class="cx">
</span><del>- if (UNLIKELY((remaining < maxTokenLength) && !(lexerFlags & LexerFlagsIgnoreReservedWords))) {
</del><ins>+ if (UNLIKELY((remaining < maxTokenLength) && !(lexerFlags & LexerFlagsIgnoreReservedWords)) && !isPrivateName) {
</ins><span class="cx"> ASSERT(shouldCreateIdentifier);
</span><span class="cx"> if (remaining < maxTokenLength) {
</span><span class="cx"> const HashEntry* entry = m_vm->keywords->getKeyword(*ident);
</span><span class="lines">@@ -1659,6 +1712,7 @@
</span><span class="cx"> ASSERT(isIdentStart(m_current));
</span><span class="cx"> FALLTHROUGH;
</span><span class="cx"> case CharacterBackSlash:
</span><ins>+ parseIdent:
</ins><span class="cx"> if (lexerFlags & LexexFlagsDontBuildKeywords)
</span><span class="cx"> token = parseIdentifier<false>(tokenData, lexerFlags, strictMode);
</span><span class="cx"> else
</span><span class="lines">@@ -1671,6 +1725,11 @@
</span><span class="cx"> m_terminator = true;
</span><span class="cx"> m_lineStart = m_code;
</span><span class="cx"> goto start;
</span><ins>+ case CharacterPrivateIdentifierStart:
+ if (m_parsingBuiltinFunction)
+ goto parseIdent;
+
+ FALLTHROUGH;
</ins><span class="cx"> case CharacterInvalid:
</span><span class="cx"> m_lexErrorMessage = invalidCharacterMessage();
</span><span class="cx"> token = ERRORTOK;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserLexerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Lexer.h (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Lexer.h 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/parser/Lexer.h 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx">
</span><span class="cx"> public:
</span><del>- Lexer(VM*);
</del><ins>+ Lexer(VM*, JSParserStrictness);
</ins><span class="cx"> ~Lexer();
</span><span class="cx">
</span><span class="cx"> // Character manipulation functions.
</span><span class="lines">@@ -237,6 +237,7 @@
</span><span class="cx"> IdentifierArena* m_arena;
</span><span class="cx">
</span><span class="cx"> VM* m_vm;
</span><ins>+ bool m_parsingBuiltinFunction;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template <>
</span><span class="lines">@@ -335,6 +336,12 @@
</span><span class="cx"> return &m_arena->makeIdentifierLCharFromUChar(m_vm, characters, length);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ASSERT_DISABLED
+ALWAYS_INLINE bool isSafeBuiltinIdentifier(VM&, const Identifier*) { return true; }
+#else
+bool isSafeBuiltinIdentifier(VM&, const Identifier*);
+#endif
+
</ins><span class="cx"> template <typename T>
</span><span class="cx"> ALWAYS_INLINE JSTokenType Lexer<T>::lexExpectIdentifier(JSToken* tokenRecord, unsigned lexerFlags, bool strictMode)
</span><span class="cx"> {
</span><span class="lines">@@ -370,10 +377,15 @@
</span><span class="cx"> ASSERT(currentOffset() >= currentLineStartOffset());
</span><span class="cx">
</span><span class="cx"> // Create the identifier if needed
</span><del>- if (lexerFlags & LexexFlagsDontBuildKeywords)
</del><ins>+ if (lexerFlags & LexexFlagsDontBuildKeywords
+#if !ASSERT_DISABLED
+ && !m_parsingBuiltinFunction
+#endif
+ )
</ins><span class="cx"> tokenData->ident = 0;
</span><span class="cx"> else
</span><span class="cx"> tokenData->ident = makeLCharIdentifier(start, ptr - start);
</span><ins>+
</ins><span class="cx"> tokenLocation->line = m_lineNumber;
</span><span class="cx"> tokenLocation->lineStartOffset = currentLineStartOffset();
</span><span class="cx"> tokenLocation->startOffset = offsetFromSourcePtr(start);
</span><span class="lines">@@ -381,6 +393,13 @@
</span><span class="cx"> ASSERT(tokenLocation->startOffset >= tokenLocation->lineStartOffset);
</span><span class="cx"> tokenRecord->m_startPosition = startPosition;
</span><span class="cx"> tokenRecord->m_endPosition = currentPosition();
</span><ins>+#if !ASSERT_DISABLED
+ if (m_parsingBuiltinFunction) {
+ if (!isSafeBuiltinIdentifier(*m_vm, tokenData->ident))
+ return ERRORTOK;
+ }
+#endif
+
</ins><span class="cx"> m_lastToken = IDENT;
</span><span class="cx"> return IDENT;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserNodescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Nodes.cpp (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Nodes.cpp 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/parser/Nodes.cpp 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -132,6 +132,12 @@
</span><span class="cx"> return node.release();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
+void ProgramNode::setClosedVariables(const Vector<RefPtr<StringImpl>>&& closedVariables)
+{
+ m_closedVariables = std::move(closedVariables);
+}
+
</ins><span class="cx"> // ------------------------------ EvalNode -----------------------------
</span><span class="cx">
</span><span class="cx"> inline EvalNode::EvalNode(VM* vm, const JSTokenLocation& startLocation, const JSTokenLocation& endLocation, unsigned endColumn, SourceElements* children, VarStack* varStack, FunctionStack* funcStack, IdentifierSet& capturedVariables, const SourceCode& source, CodeFeatures features, int numConstants)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserNodesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Nodes.h (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Nodes.h 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/parser/Nodes.h 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -1431,6 +1431,7 @@
</span><span class="cx"> bool needsActivation() const { return (hasCapturedVariables()) || (m_features & (EvalFeature | WithFeature | CatchFeature)); }
</span><span class="cx"> bool hasCapturedVariables() const { return !!m_capturedVariables.size(); }
</span><span class="cx"> size_t capturedVariableCount() const { return m_capturedVariables.size(); }
</span><ins>+ const IdentifierSet& capturedVariables() const { return m_capturedVariables; }
</ins><span class="cx"> bool captures(const Identifier& ident) { return m_capturedVariables.contains(ident.impl()); }
</span><span class="cx">
</span><span class="cx"> VarStack& varStack() { return m_varStack; }
</span><span class="lines">@@ -1446,6 +1447,8 @@
</span><span class="cx"> StatementNode* singleStatement() const;
</span><span class="cx">
</span><span class="cx"> void emitStatementsBytecode(BytecodeGenerator&, RegisterID* destination);
</span><ins>+
+ void setClosedVariables(const Vector<RefPtr<StringImpl>>&&) { }
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> void setSource(const SourceCode& source) { m_source = source; }
</span><span class="lines">@@ -1475,11 +1478,13 @@
</span><span class="cx">
</span><span class="cx"> static const bool scopeIsFunction = false;
</span><span class="cx">
</span><ins>+ void setClosedVariables(const Vector<RefPtr<StringImpl>>&&);
+ const Vector<RefPtr<StringImpl>>& closedVariables() const { return m_closedVariables; }
</ins><span class="cx"> private:
</span><span class="cx"> ProgramNode(VM*, const JSTokenLocation& start, const JSTokenLocation& end, unsigned startColumn, unsigned endColumn, SourceElements*, VarStack*, FunctionStack*, IdentifierSet&, const SourceCode&, CodeFeatures, int numConstants);
</span><span class="cx">
</span><span class="cx"> virtual void emitBytecode(BytecodeGenerator&, RegisterID* = 0) override;
</span><del>-
</del><ins>+ Vector<RefPtr<StringImpl>> m_closedVariables;
</ins><span class="cx"> unsigned m_startColumn;
</span><span class="cx"> unsigned m_endColumn;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Parser.cpp (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Parser.cpp 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/parser/Parser.cpp 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -205,8 +205,9 @@
</span><span class="cx"> , m_lastIdentifier(0)
</span><span class="cx"> , m_lastFunctionName(nullptr)
</span><span class="cx"> , m_sourceElements(0)
</span><ins>+ , m_parsingBuiltin(strictness == JSParseBuiltin)
</ins><span class="cx"> {
</span><del>- m_lexer = adoptPtr(new LexerType(vm));
</del><ins>+ m_lexer = adoptPtr(new LexerType(vm, strictness));
</ins><span class="cx"> m_arena = m_vm->parserArena.get();
</span><span class="cx"> m_lexer->setCode(source, m_arena);
</span><span class="cx"> m_token.m_location.line = source.firstLine();
</span><span class="lines">@@ -271,6 +272,7 @@
</span><span class="cx"> IdentifierSet capturedVariables;
</span><span class="cx"> bool modifiedParameter = false;
</span><span class="cx"> scope->getCapturedVariables(capturedVariables, modifiedParameter);
</span><ins>+
</ins><span class="cx"> CodeFeatures features = context.features();
</span><span class="cx"> if (scope->strictMode())
</span><span class="cx"> features |= StrictModeFeature;
</span><span class="lines">@@ -278,21 +280,36 @@
</span><span class="cx"> features |= ShadowsArgumentsFeature;
</span><span class="cx"> if (modifiedParameter)
</span><span class="cx"> features |= ModifiedParameterFeature;
</span><del>-
</del><ins>+
+ Vector<RefPtr<StringImpl>> closedVariables;
+ if (m_parsingBuiltin) {
+ RELEASE_ASSERT(!capturedVariables.size());
+ IdentifierSet usedVariables;
+ scope->getUsedVariables(usedVariables);
+ for (const auto& variable : usedVariables) {
+ if (scope->hasDeclaredVariable(Identifier(m_vm, variable.get())))
+ continue;
+
+ if (scope->hasDeclaredParameter(Identifier(m_vm, variable.get())))
+ continue;
+ closedVariables.append(variable);
+ }
+ }
</ins><span class="cx"> didFinishParsing(sourceElements, context.varDeclarations(), context.funcDeclarations(), features,
</span><del>- context.numConstants(), capturedVariables);
</del><ins>+ context.numConstants(), capturedVariables, std::move(closedVariables));
</ins><span class="cx">
</span><span class="cx"> return parseError;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename LexerType>
</span><span class="cx"> void Parser<LexerType>::didFinishParsing(SourceElements* sourceElements, ParserArenaData<DeclarationStacks::VarStack>* varStack,
</span><del>- ParserArenaData<DeclarationStacks::FunctionStack>* funcStack, CodeFeatures features, int numConstants, IdentifierSet& capturedVars)
</del><ins>+ ParserArenaData<DeclarationStacks::FunctionStack>* funcStack, CodeFeatures features, int numConstants, IdentifierSet& capturedVars, const Vector<RefPtr<StringImpl>>&& closedVariables)
</ins><span class="cx"> {
</span><span class="cx"> m_sourceElements = sourceElements;
</span><span class="cx"> m_varDeclarations = varStack;
</span><span class="cx"> m_funcDeclarations = funcStack;
</span><span class="cx"> m_capturedVariables.swap(capturedVars);
</span><ins>+ m_closedVariables = closedVariables;
</ins><span class="cx"> m_features = features;
</span><span class="cx"> m_numConstants = numConstants;
</span><span class="cx"> }
</span><span class="lines">@@ -2362,6 +2379,10 @@
</span><span class="cx"> case RESERVED:
</span><span class="cx"> out.print("Unexpected use of reserved word '", getToken(), "'");
</span><span class="cx"> return;
</span><ins>+
+ case INVALID_PRIVATE_NAME_ERRORTOK:
+ out.print("Invalid private name '", getToken(), "'");
+ return;
</ins><span class="cx">
</span><span class="cx"> case IDENT:
</span><span class="cx"> out.print("Unexpected identifier '", getToken(), "'");
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Parser.h (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Parser.h 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/parser/Parser.h 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -259,6 +259,10 @@
</span><span class="cx"> return isValidStrictMode ? BindingSucceeded : StrictBindingFailed;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void getUsedVariables(IdentifierSet& usedVariables)
+ {
+ usedVariables.swap(m_usedVariables);
+ }
</ins><span class="cx">
</span><span class="cx"> void useVariable(const Identifier* ident, bool isEval)
</span><span class="cx"> {
</span><span class="lines">@@ -414,6 +418,7 @@
</span><span class="cx"> PassRefPtr<ParsedNode> parse(ParserError&);
</span><span class="cx">
</span><span class="cx"> JSTextPosition positionBeforeLastNewline() const { return m_lexer->positionBeforeLastNewline(); }
</span><ins>+ const Vector<RefPtr<StringImpl>>&& closedVariables() { return std::move(m_closedVariables); }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> struct AllowInOverride {
</span><span class="lines">@@ -540,7 +545,7 @@
</span><span class="cx"> String parseInner();
</span><span class="cx">
</span><span class="cx"> void didFinishParsing(SourceElements*, ParserArenaData<DeclarationStacks::VarStack>*,
</span><del>- ParserArenaData<DeclarationStacks::FunctionStack>*, CodeFeatures, int, IdentifierSet&);
</del><ins>+ ParserArenaData<DeclarationStacks::FunctionStack>*, CodeFeatures, int, IdentifierSet&, const Vector<RefPtr<StringImpl>>&&);
</ins><span class="cx">
</span><span class="cx"> // Used to determine type of error to report.
</span><span class="cx"> bool isFunctionBodyNode(ScopeNode*) { return false; }
</span><span class="lines">@@ -840,9 +845,11 @@
</span><span class="cx"> const Identifier* m_lastFunctionName;
</span><span class="cx"> RefPtr<SourceProviderCache> m_functionCache;
</span><span class="cx"> SourceElements* m_sourceElements;
</span><ins>+ bool m_parsingBuiltin;
</ins><span class="cx"> ParserArenaData<DeclarationStacks::VarStack>* m_varDeclarations;
</span><span class="cx"> ParserArenaData<DeclarationStacks::FunctionStack>* m_funcDeclarations;
</span><span class="cx"> IdentifierSet m_capturedVariables;
</span><ins>+ Vector<RefPtr<StringImpl>> m_closedVariables;
</ins><span class="cx"> CodeFeatures m_features;
</span><span class="cx"> int m_numConstants;
</span><span class="cx">
</span><span class="lines">@@ -957,6 +964,12 @@
</span><span class="cx"> RefPtr<ParsedNode> result = parser.parse<ParsedNode>(error);
</span><span class="cx"> if (positionBeforeLastNewline)
</span><span class="cx"> *positionBeforeLastNewline = parser.positionBeforeLastNewline();
</span><ins>+ if (strictness == JSParseBuiltin) {
+ if (!result)
+ WTF::dataLog("Error compiling builtin: ", error.m_message, "\n");
+ RELEASE_ASSERT(result);
+ result->setClosedVariables(std::move(parser.closedVariables()));
+ }
</ins><span class="cx"> return result.release();
</span><span class="cx"> }
</span><span class="cx"> Parser<Lexer<UChar>> parser(vm, source, parameters, name, strictness, parserMode);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParserModesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/ParserModes.h (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/ParserModes.h 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/parser/ParserModes.h 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-enum JSParserStrictness { JSParseNormal, JSParseStrict };
</del><ins>+enum JSParserStrictness { JSParseNormal, JSParseBuiltin, JSParseStrict };
</ins><span class="cx"> enum JSParserMode { JSParseProgramCode, JSParseFunctionCode };
</span><span class="cx">
</span><span class="cx"> enum ProfilerMode { ProfilerOff, ProfilerOn };
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParserTokensh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/ParserTokens.h (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/ParserTokens.h 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/parser/ParserTokens.h 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -149,6 +149,7 @@
</span><span class="cx"> INVALID_NUMERIC_LITERAL_ERRORTOK = 7 | ErrorTokenFlag,
</span><span class="cx"> UNTERMINATED_STRING_LITERAL_ERRORTOK = 8 | ErrorTokenFlag | UnterminatedErrorTokenFlag,
</span><span class="cx"> INVALID_STRING_LITERAL_ERRORTOK = 9 | ErrorTokenFlag,
</span><ins>+ INVALID_PRIVATE_NAME_ERRORTOK = 10 | ErrorTokenFlag
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> struct JSTextPosition {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeArrayPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -56,7 +56,6 @@
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL arrayProtoFuncSort(ExecState*);
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL arrayProtoFuncSplice(ExecState*);
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL arrayProtoFuncUnShift(ExecState*);
</span><del>-static EncodedJSValue JSC_HOST_CALL arrayProtoFuncEvery(ExecState*);
</del><span class="cx"> static EncodedJSValue JSC_HOST_CALL arrayProtoFuncForEach(ExecState*);
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL arrayProtoFuncSome(ExecState*);
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL arrayProtoFuncIndexOf(ExecState*);
</span><span class="lines">@@ -955,69 +954,6 @@
</span><span class="cx"> return JSValue::encode(resultArray);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// Documentation for these three is available at:
-// http://developer-test.mozilla.org/en/docs/Core_JavaScript_1.5_Reference:Objects:Array:every
-// http://developer-test.mozilla.org/en/docs/Core_JavaScript_1.5_Reference:Objects:Array:forEach
-// http://developer-test.mozilla.org/en/docs/Core_JavaScript_1.5_Reference:Objects:Array:some
-
-EncodedJSValue JSC_HOST_CALL arrayProtoFuncEvery(ExecState* exec)
-{
- JSObject* thisObj = exec->hostThisValue().toThis(exec, StrictMode).toObject(exec);
- unsigned length = thisObj->get(exec, exec->propertyNames().length).toUInt32(exec);
- if (exec->hadException())
- return JSValue::encode(jsUndefined());
-
- JSValue function = exec->argument(0);
- CallData callData;
- CallType callType = getCallData(function, callData);
- if (callType == CallTypeNone)
- return throwVMTypeError(exec);
-
- JSValue applyThis = exec->argument(1);
-
- JSValue result = jsBoolean(true);
-
- unsigned k = 0;
- if (callType == CallTypeJS && isJSArray(thisObj)) {
- JSFunction* f = jsCast<JSFunction*>(function);
- JSArray* array = asArray(thisObj);
- CachedCall cachedCall(exec, f, 3);
- for (; k < length && !exec->hadException(); ++k) {
- if (UNLIKELY(!array->canGetIndexQuickly(k)))
- break;
-
- cachedCall.setThis(applyThis);
- cachedCall.setArgument(0, array->getIndexQuickly(k));
- cachedCall.setArgument(1, jsNumber(k));
- cachedCall.setArgument(2, thisObj);
- JSValue result = cachedCall.call();
- if (!result.toBoolean(exec))
- return JSValue::encode(jsBoolean(false));
- }
- }
- for (; k < length && !exec->hadException(); ++k) {
- PropertySlot slot(thisObj);
- if (!thisObj->getPropertySlot(exec, k, slot))
- continue;
-
- MarkedArgumentBuffer eachArguments;
- eachArguments.append(slot.getValue(exec, k));
- eachArguments.append(jsNumber(k));
- eachArguments.append(thisObj);
-
- if (exec->hadException())
- return JSValue::encode(jsUndefined());
-
- bool predicateResult = call(exec, function, callType, callData, applyThis, eachArguments).toBoolean(exec);
- if (!predicateResult) {
- result = jsBoolean(false);
- break;
- }
- }
-
- return JSValue::encode(result);
-}
-
</del><span class="cx"> EncodedJSValue JSC_HOST_CALL arrayProtoFuncForEach(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSObject* thisObj = exec->hostThisValue().toThis(exec, StrictMode).toObject(exec);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCodeCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/CodeCache.cpp (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/CodeCache.cpp 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/runtime/CodeCache.cpp 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -144,24 +144,26 @@
</span><span class="cx"> JSTextPosition positionBeforeLastNewline;
</span><span class="cx"> RefPtr<ProgramNode> program = parse<ProgramNode>(&vm, source, 0, Identifier(), JSParseNormal, JSParseProgramCode, error, &positionBeforeLastNewline);
</span><span class="cx"> if (!program) {
</span><del>- ASSERT(error.m_type != ParserError::ErrorNone);
</del><ins>+ RELEASE_ASSERT(error.m_type != ParserError::ErrorNone);
</ins><span class="cx"> m_sourceCode.remove(addResult.iterator);
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // This function assumes an input string that would result in a single anonymous function expression.
</span><span class="cx"> StatementNode* exprStatement = program->singleStatement();
</span><del>- ASSERT(exprStatement);
- ASSERT(exprStatement->isExprStatement());
</del><ins>+ RELEASE_ASSERT(exprStatement);
+ RELEASE_ASSERT(exprStatement->isExprStatement());
</ins><span class="cx"> ExpressionNode* funcExpr = static_cast<ExprStatementNode*>(exprStatement)->expr();
</span><del>- ASSERT(funcExpr);
</del><ins>+ RELEASE_ASSERT(funcExpr);
</ins><span class="cx"> RELEASE_ASSERT(funcExpr->isFuncExprNode());
</span><span class="cx"> FunctionBodyNode* body = static_cast<FuncExprNode*>(funcExpr)->body();
</span><ins>+ RELEASE_ASSERT(!program->hasCapturedVariables());
+
</ins><span class="cx"> body->setEndPosition(positionBeforeLastNewline);
</span><del>- ASSERT(body);
- ASSERT(body->ident().isNull());
</del><ins>+ RELEASE_ASSERT(body);
+ RELEASE_ASSERT(body->ident().isNull());
</ins><span class="cx">
</span><del>- UnlinkedFunctionExecutable* functionExecutable = UnlinkedFunctionExecutable::create(&vm, source, body, true);
</del><ins>+ UnlinkedFunctionExecutable* functionExecutable = UnlinkedFunctionExecutable::create(&vm, source, body, true, UnlinkedNormalFunction);
</ins><span class="cx"> functionExecutable->m_nameValue.set(vm, functionExecutable, jsString(&vm, name.string()));
</span><span class="cx">
</span><span class="cx"> addResult.iterator->value = SourceCodeValue(vm, functionExecutable, m_sourceCode.age());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCommonIdentifierscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.cpp (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.cpp 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.cpp 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -21,13 +21,15 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "CommonIdentifiers.h"
</span><span class="cx">
</span><ins>+#include "BuiltinNames.h"
+#include "JSCBuiltins.h"
</ins><span class="cx"> #include "PrivateName.h"
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="cx"> #define INITIALIZE_PROPERTY_NAME(name) , name(vm, #name)
</span><span class="cx"> #define INITIALIZE_KEYWORD(name) , name##Keyword(vm, #name)
</span><del>-#define INITIALIZE_PRIVATE_NAME(name) , name##PrivateName(Identifier::from(PrivateName()))
</del><ins>+#define INITIALIZE_PRIVATE_NAME(name) , name##PrivateName(m_builtinNames->name##PrivateName())
</ins><span class="cx">
</span><span class="cx"> CommonIdentifiers::CommonIdentifiers(VM* vm)
</span><span class="cx"> : nullIdentifier()
</span><span class="lines">@@ -35,11 +37,26 @@
</span><span class="cx"> , underscoreProto(vm, "__proto__")
</span><span class="cx"> , thisIdentifier(vm, "this")
</span><span class="cx"> , useStrictIdentifier(vm, "use strict")
</span><del>- , hasNextIdentifier(vm, "hasNext")
</del><ins>+ , m_builtinNames(new BuiltinNames(vm, this))
</ins><span class="cx"> JSC_COMMON_IDENTIFIERS_EACH_KEYWORD(INITIALIZE_KEYWORD)
</span><span class="cx"> JSC_COMMON_IDENTIFIERS_EACH_PROPERTY_NAME(INITIALIZE_PROPERTY_NAME)
</span><span class="cx"> JSC_COMMON_PRIVATE_IDENTIFIERS_EACH_PROPERTY_NAME(INITIALIZE_PRIVATE_NAME)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+CommonIdentifiers::~CommonIdentifiers()
+{
+}
+
+const Identifier* CommonIdentifiers::getPrivateName(const Identifier& ident) const
+{
+ return m_builtinNames->getPrivateName(ident);
+}
+
+Identifier CommonIdentifiers::getPublicName(const Identifier& ident) const
+{
+ return m_builtinNames->getPublicName(ident);
+}
+
+
</ins><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCommonIdentifiersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.h (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.h 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.h 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -207,6 +207,8 @@
</span><span class="cx"> macro(yield)
</span><span class="cx">
</span><span class="cx"> #define JSC_COMMON_PRIVATE_IDENTIFIERS_EACH_PROPERTY_NAME(macro) \
</span><ins>+ macro(apply) \
+ macro(call) \
</ins><span class="cx"> macro(iterator) \
</span><span class="cx"> macro(iteratorNext) \
</span><span class="cx"> macro(resolve) \
</span><span class="lines">@@ -217,23 +219,33 @@
</span><span class="cx"> macro(index) \
</span><span class="cx"> macro(values) \
</span><span class="cx"> macro(deferred) \
</span><del>- macro(countdownHolder)
</del><ins>+ macro(countdownHolder) \
+ macro(Object) \
+ macro(TypeError) \
+ macro(undefined)
</ins><span class="cx">
</span><span class="cx"> namespace JSC {
</span><del>-
</del><ins>+
+ class BuiltinNames;
+
</ins><span class="cx"> class CommonIdentifiers {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(CommonIdentifiers); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> private:
</span><span class="cx"> CommonIdentifiers(VM*);
</span><ins>+ ~CommonIdentifiers();
</ins><span class="cx"> friend class VM;
</span><del>-
</del><ins>+
</ins><span class="cx"> public:
</span><ins>+ const BuiltinNames& builtinNames() const { return *m_builtinNames; }
</ins><span class="cx"> const Identifier nullIdentifier;
</span><span class="cx"> const Identifier emptyIdentifier;
</span><span class="cx"> const Identifier underscoreProto;
</span><span class="cx"> const Identifier thisIdentifier;
</span><span class="cx"> const Identifier useStrictIdentifier;
</span><del>- const Identifier hasNextIdentifier;
</del><ins>+ private:
+ std::unique_ptr<BuiltinNames> m_builtinNames;
+
+ public:
</ins><span class="cx">
</span><span class="cx"> #define JSC_IDENTIFIER_DECLARE_KEYWORD_NAME_GLOBAL(name) const Identifier name##Keyword;
</span><span class="cx"> JSC_COMMON_IDENTIFIERS_EACH_KEYWORD(JSC_IDENTIFIER_DECLARE_KEYWORD_NAME_GLOBAL)
</span><span class="lines">@@ -246,6 +258,9 @@
</span><span class="cx"> #define JSC_IDENTIFIER_DECLARE_PRIVATE_PROPERTY_NAME_GLOBAL(name) const Identifier name##PrivateName;
</span><span class="cx"> JSC_COMMON_PRIVATE_IDENTIFIERS_EACH_PROPERTY_NAME(JSC_IDENTIFIER_DECLARE_PRIVATE_PROPERTY_NAME_GLOBAL)
</span><span class="cx"> #undef JSC_IDENTIFIER_DECLARE_PRIVATE_PROPERTY_NAME_GLOBAL
</span><ins>+
+ const Identifier* getPrivateName(const Identifier&) const;
+ Identifier getPublicName(const Identifier&) const;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeExceptionHelperscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ExceptionHelpers.cpp (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ExceptionHelpers.cpp 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/runtime/ExceptionHelpers.cpp 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -81,6 +81,11 @@
</span><span class="cx">
</span><span class="cx"> JSObject* createUndefinedVariableError(ExecState* exec, const Identifier& ident)
</span><span class="cx"> {
</span><ins>+
+ if (ident.impl()->isEmptyUnique()) {
+ String message(makeString("Can't find private variable: @", exec->propertyNames().getPublicName(ident).string()));
+ return createReferenceError(exec, message);
+ }
</ins><span class="cx"> String message(makeString("Can't find variable: ", ident.string()));
</span><span class="cx"> return createReferenceError(exec, message);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeExecutableh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Executable.h (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Executable.h 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/runtime/Executable.h 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -484,7 +484,7 @@
</span><span class="cx">
</span><span class="cx"> void clearCode();
</span><span class="cx">
</span><del>- ExecutableInfo executableInfo() const { return ExecutableInfo(needsActivation(), usesEval(), isStrictMode(), false); }
</del><ins>+ ExecutableInfo executableInfo() const { return ExecutableInfo(needsActivation(), usesEval(), isStrictMode(), false, false); }
</ins><span class="cx">
</span><span class="cx"> unsigned numVariables() { return m_unlinkedEvalCodeBlock->numVariables(); }
</span><span class="cx"> unsigned numberOfFunctionDecls() { return m_unlinkedEvalCodeBlock->numberOfFunctionDecls(); }
</span><span class="lines">@@ -540,7 +540,7 @@
</span><span class="cx">
</span><span class="cx"> void clearCode();
</span><span class="cx">
</span><del>- ExecutableInfo executableInfo() const { return ExecutableInfo(needsActivation(), usesEval(), isStrictMode(), false); }
</del><ins>+ ExecutableInfo executableInfo() const { return ExecutableInfo(needsActivation(), usesEval(), isStrictMode(), false, false); }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> friend class ScriptExecutable;
</span><span class="lines">@@ -630,6 +630,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FunctionMode functionMode() { return m_unlinkedExecutable->functionMode(); }
</span><ins>+ bool isBuiltinFunction() const { return m_unlinkedExecutable->isBuiltinFunction(); }
</ins><span class="cx"> const Identifier& name() { return m_unlinkedExecutable->name(); }
</span><span class="cx"> const Identifier& inferredName() { return m_unlinkedExecutable->inferredName(); }
</span><span class="cx"> JSString* nameValue() const { return m_unlinkedExecutable->nameValue(); }
</span><span class="lines">@@ -677,14 +678,6 @@
</span><span class="cx"> bool m_didParseForTheFirstTime;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-inline bool isHostFunction(JSValue value, NativeFunction nativeFunction)
-{
- JSFunction* function = jsCast<JSFunction*>(getJSFunction(value));
- if (!function || !function->isHostFunction())
- return false;
- return function->nativeFunction() == nativeFunction;
-}
-
</del><span class="cx"> inline void ExecutableBase::clearCodeVirtual(ExecutableBase* executable)
</span><span class="cx"> {
</span><span class="cx"> switch (executable->structure()->typeInfo().type()) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeFunctionPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/FunctionPrototype.cpp (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/FunctionPrototype.cpp 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/runtime/FunctionPrototype.cpp 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><span class="cx"> if (thisValue.inherits(JSFunction::info())) {
</span><span class="cx"> JSFunction* function = jsCast<JSFunction*>(thisValue);
</span><del>- if (function->isHostFunction())
</del><ins>+ if (function->isHostOrBuiltinFunction())
</ins><span class="cx"> return JSValue::encode(jsMakeNontrivialString(exec, "function ", function->name(exec), "() {\n [native code]\n}"));
</span><span class="cx"> FunctionExecutable* executable = function->jsExecutable();
</span><span class="cx"> String sourceString = executable->source().toString();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSActivationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSActivation.cpp (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSActivation.cpp 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/runtime/JSActivation.cpp 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx">
</span><span class="cx"> inline bool JSActivation::symbolTableGet(PropertyName propertyName, PropertySlot& slot)
</span><span class="cx"> {
</span><del>- SymbolTableEntry entry = symbolTable()->inlineGet(propertyName.publicName());
</del><ins>+ SymbolTableEntry entry = symbolTable()->inlineGet(propertyName.uid());
</ins><span class="cx"> if (entry.isNull())
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx">
</span><span class="cx"> inline bool JSActivation::symbolTableGet(PropertyName propertyName, PropertyDescriptor& descriptor)
</span><span class="cx"> {
</span><del>- SymbolTableEntry entry = symbolTable()->inlineGet(propertyName.publicName());
</del><ins>+ SymbolTableEntry entry = symbolTable()->inlineGet(propertyName.uid());
</ins><span class="cx"> if (entry.isNull())
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> VM& vm = exec->vm();
</span><span class="cx"> ASSERT(!Heap::heap(value) || Heap::heap(value) == Heap::heap(this));
</span><span class="cx">
</span><del>- SymbolTableEntry entry = symbolTable()->inlineGet(propertyName.publicName());
</del><ins>+ SymbolTableEntry entry = symbolTable()->inlineGet(propertyName.uid());
</ins><span class="cx"> if (entry.isNull())
</span><span class="cx"> return false;
</span><span class="cx"> if (entry.isReadOnly()) {
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> WriteBarrierBase<Unknown>* reg;
</span><span class="cx"> {
</span><span class="cx"> ConcurrentJITLocker locker(symbolTable()->m_lock);
</span><del>- SymbolTable::Map::iterator iter = symbolTable()->find(locker, propertyName.publicName());
</del><ins>+ SymbolTable::Map::iterator iter = symbolTable()->find(locker, propertyName.uid());
</ins><span class="cx"> if (iter == symbolTable()->end(locker))
</span><span class="cx"> return false;
</span><span class="cx"> SymbolTableEntry& entry = iter->value;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSFunctioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSFunction.cpp (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSFunction.cpp 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/runtime/JSFunction.cpp 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -33,7 +33,8 @@
</span><span class="cx"> #include "FunctionPrototype.h"
</span><span class="cx"> #include "GetterSetter.h"
</span><span class="cx"> #include "JSArray.h"
</span><del>-#include "JSBoundFunction.h"
</del><ins>+#include "JSBoundFunction.h"
+#include "JSFunctionInlines.h"
</ins><span class="cx"> #include "JSGlobalObject.h"
</span><span class="cx"> #include "JSNameScope.h"
</span><span class="cx"> #include "JSNotAnObject.h"
</span><span class="lines">@@ -119,6 +120,14 @@
</span><span class="cx"> m_scope.set(vm, this, JSNameScope::create(vm, m_scope->globalObject(), executable->name(), this, ReadOnly | DontDelete, m_scope.get()));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+JSFunction* JSFunction::createBuiltinFunction(VM& vm, FunctionExecutable* executable, JSGlobalObject* globalObject)
+{
+ JSFunction* function = create(vm, executable, globalObject);
+ function->putDirect(vm, vm.propertyNames->name, jsString(&vm, executable->name().string()), DontDelete | ReadOnly | DontEnum);
+ function->putDirect(vm, vm.propertyNames->length, jsNumber(executable->parameterCount()), DontDelete | ReadOnly | DontEnum);
+ return function;
+}
+
</ins><span class="cx"> ObjectAllocationProfile* JSFunction::createAllocationProfile(ExecState* exec, size_t inlineCapacity)
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><span class="lines">@@ -152,7 +161,7 @@
</span><span class="cx"> return explicitName;
</span><span class="cx">
</span><span class="cx"> const String actualName = name(exec);
</span><del>- if (!actualName.isEmpty() || isHostFunction())
</del><ins>+ if (!actualName.isEmpty() || isHostOrBuiltinFunction())
</ins><span class="cx"> return actualName;
</span><span class="cx">
</span><span class="cx"> return jsExecutable()->inferredName().string();
</span><span class="lines">@@ -160,11 +169,21 @@
</span><span class="cx">
</span><span class="cx"> const SourceCode* JSFunction::sourceCode() const
</span><span class="cx"> {
</span><del>- if (isHostFunction())
</del><ins>+ if (isHostOrBuiltinFunction())
</ins><span class="cx"> return 0;
</span><span class="cx"> return &jsExecutable()->source();
</span><span class="cx"> }
</span><ins>+
+bool JSFunction::isHostOrBuiltinFunction() const
+{
+ return isHostFunction() || isBuiltinFunction();
+}
</ins><span class="cx">
</span><ins>+bool JSFunction::isBuiltinFunction() const
+{
+ return !isHostFunction() && jsExecutable()->isBuiltinFunction();
+}
+
</ins><span class="cx"> void JSFunction::visitChildren(JSCell* cell, SlotVisitor& visitor)
</span><span class="cx"> {
</span><span class="cx"> JSFunction* thisObject = jsCast<JSFunction*>(cell);
</span><span class="lines">@@ -287,7 +306,7 @@
</span><span class="cx"> if (!caller.isObject() || !asObject(caller)->inherits(JSFunction::info()))
</span><span class="cx"> return JSValue::encode(caller);
</span><span class="cx"> JSFunction* function = jsCast<JSFunction*>(caller);
</span><del>- if (function->isHostFunction() || !function->jsExecutable()->isStrictMode())
</del><ins>+ if (function->isHostOrBuiltinFunction() || !function->jsExecutable()->isStrictMode())
</ins><span class="cx"> return JSValue::encode(caller);
</span><span class="cx"> return JSValue::encode(throwTypeError(exec, ASCIILiteral("Function.caller used to retrieve strict caller")));
</span><span class="cx"> }
</span><span class="lines">@@ -309,7 +328,7 @@
</span><span class="cx"> bool JSFunction::getOwnPropertySlot(JSObject* object, ExecState* exec, PropertyName propertyName, PropertySlot& slot)
</span><span class="cx"> {
</span><span class="cx"> JSFunction* thisObject = jsCast<JSFunction*>(object);
</span><del>- if (thisObject->isHostFunction())
</del><ins>+ if (thisObject->isHostOrBuiltinFunction())
</ins><span class="cx"> return Base::getOwnPropertySlot(thisObject, exec, propertyName, slot);
</span><span class="cx">
</span><span class="cx"> if (propertyName == exec->propertyNames().prototype) {
</span><span class="lines">@@ -371,7 +390,7 @@
</span><span class="cx"> void JSFunction::getOwnNonIndexPropertyNames(JSObject* object, ExecState* exec, PropertyNameArray& propertyNames, EnumerationMode mode)
</span><span class="cx"> {
</span><span class="cx"> JSFunction* thisObject = jsCast<JSFunction*>(object);
</span><del>- if (!thisObject->isHostFunction() && (mode == IncludeDontEnumProperties)) {
</del><ins>+ if (!thisObject->isHostOrBuiltinFunction() && (mode == IncludeDontEnumProperties)) {
</ins><span class="cx"> // Make sure prototype has been reified.
</span><span class="cx"> PropertySlot slot(thisObject);
</span><span class="cx"> thisObject->methodTable()->getOwnPropertySlot(thisObject, exec, exec->propertyNames().prototype, slot);
</span><span class="lines">@@ -387,7 +406,7 @@
</span><span class="cx"> void JSFunction::put(JSCell* cell, ExecState* exec, PropertyName propertyName, JSValue value, PutPropertySlot& slot)
</span><span class="cx"> {
</span><span class="cx"> JSFunction* thisObject = jsCast<JSFunction*>(cell);
</span><del>- if (thisObject->isHostFunction()) {
</del><ins>+ if (thisObject->isHostOrBuiltinFunction()) {
</ins><span class="cx"> Base::put(thisObject, exec, propertyName, value, slot);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -435,7 +454,7 @@
</span><span class="cx"> bool JSFunction::defineOwnProperty(JSObject* object, ExecState* exec, PropertyName propertyName, const PropertyDescriptor& descriptor, bool throwException)
</span><span class="cx"> {
</span><span class="cx"> JSFunction* thisObject = jsCast<JSFunction*>(object);
</span><del>- if (thisObject->isHostFunction())
</del><ins>+ if (thisObject->isHostOrBuiltinFunction())
</ins><span class="cx"> return Base::defineOwnProperty(object, exec, propertyName, descriptor, throwException);
</span><span class="cx">
</span><span class="cx"> if (propertyName == exec->propertyNames().prototype) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSFunctionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSFunction.h (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSFunction.h 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/runtime/JSFunction.h 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -68,6 +68,8 @@
</span><span class="cx"> return function;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ static JSFunction* createBuiltinFunction(VM&, FunctionExecutable*, JSGlobalObject*);
+
</ins><span class="cx"> static void destroy(JSCell*);
</span><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE String name(ExecState*);
</span><span class="lines">@@ -146,6 +148,10 @@
</span><span class="cx"> return m_allocationProfileWatchpoint;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ bool isHostOrBuiltinFunction() const;
+ bool isBuiltinFunction() const;
+ JS_EXPORT_PRIVATE bool isHostFunctionNonInline() const;
+
</ins><span class="cx"> protected:
</span><span class="cx"> const static unsigned StructureFlags = OverridesGetOwnPropertySlot | ImplementsHasInstance | OverridesVisitChildren | OverridesGetPropertyNames | JSObject::StructureFlags;
</span><span class="cx">
</span><span class="lines">@@ -170,8 +176,6 @@
</span><span class="cx"> private:
</span><span class="cx"> friend class LLIntOffsetsExtractor;
</span><span class="cx">
</span><del>- JS_EXPORT_PRIVATE bool isHostFunctionNonInline() const;
-
</del><span class="cx"> static EncodedJSValue argumentsGetter(ExecState*, JSObject*, EncodedJSValue, PropertyName);
</span><span class="cx"> static EncodedJSValue callerGetter(ExecState*, JSObject*, EncodedJSValue, PropertyName);
</span><span class="cx"> static EncodedJSValue lengthGetter(ExecState*, JSObject*, EncodedJSValue, PropertyName);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSFunctionInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSFunctionInlines.h (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSFunctionInlines.h 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/runtime/JSFunctionInlines.h 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -53,16 +53,24 @@
</span><span class="cx">
</span><span class="cx"> inline NativeFunction JSFunction::nativeFunction()
</span><span class="cx"> {
</span><del>- ASSERT(isHostFunction());
</del><ins>+ ASSERT(isHostFunctionNonInline());
</ins><span class="cx"> return static_cast<NativeExecutable*>(m_executable.get())->function();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline NativeFunction JSFunction::nativeConstructor()
</span><span class="cx"> {
</span><del>- ASSERT(isHostFunction());
</del><ins>+ ASSERT(isHostFunctionNonInline());
</ins><span class="cx"> return static_cast<NativeExecutable*>(m_executable.get())->constructor();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline bool isHostFunction(JSValue value, NativeFunction nativeFunction)
+{
+ JSFunction* function = jsCast<JSFunction*>(getJSFunction(value));
+ if (!function || !function->isHostFunction())
+ return false;
+ return function->nativeFunction() == nativeFunction;
+}
+
</ins><span class="cx"> } // namespace JSC
</span><span class="cx">
</span><span class="cx"> #endif // JSFunctionInlines_h
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -353,7 +353,8 @@
</span><span class="cx">
</span><span class="cx"> // Constructors
</span><span class="cx">
</span><del>- JSCell* objectConstructor = ObjectConstructor::create(vm, ObjectConstructor::createStructure(vm, this, m_functionPrototype.get()), m_objectPrototype.get());
</del><ins>+ ObjectConstructor* objectConstructor = ObjectConstructor::create(vm, ObjectConstructor::createStructure(vm, this, m_functionPrototype.get()), m_objectPrototype.get());
+ m_objectConstructor.set(vm, this, objectConstructor);
</ins><span class="cx"> JSCell* functionConstructor = FunctionConstructor::create(vm, FunctionConstructor::createStructure(vm, this, m_functionPrototype.get()), m_functionPrototype.get());
</span><span class="cx"> JSCell* arrayConstructor = ArrayConstructor::create(vm, ArrayConstructor::createStructure(vm, this, m_functionPrototype.get()), m_arrayPrototype.get());
</span><span class="cx">
</span><span class="lines">@@ -439,7 +440,10 @@
</span><span class="cx"> GlobalPropertyInfo staticGlobals[] = {
</span><span class="cx"> GlobalPropertyInfo(vm.propertyNames->NaN, jsNaN(), DontEnum | DontDelete | ReadOnly),
</span><span class="cx"> GlobalPropertyInfo(vm.propertyNames->Infinity, jsNumber(std::numeric_limits<double>::infinity()), DontEnum | DontDelete | ReadOnly),
</span><del>- GlobalPropertyInfo(vm.propertyNames->undefinedKeyword, jsUndefined(), DontEnum | DontDelete | ReadOnly)
</del><ins>+ GlobalPropertyInfo(vm.propertyNames->undefinedKeyword, jsUndefined(), DontEnum | DontDelete | ReadOnly),
+ GlobalPropertyInfo(vm.propertyNames->undefinedPrivateName, jsUndefined(), DontEnum | DontDelete | ReadOnly),
+ GlobalPropertyInfo(vm.propertyNames->ObjectPrivateName, objectConstructor, DontEnum | DontDelete | ReadOnly),
+ GlobalPropertyInfo(vm.propertyNames->TypeErrorPrivateName, m_typeErrorConstructor.get(), DontEnum | DontDelete | ReadOnly)
</ins><span class="cx"> };
</span><span class="cx"> addStaticGlobals(staticGlobals, WTF_ARRAY_LENGTH(staticGlobals));
</span><span class="cx">
</span><span class="lines">@@ -615,6 +619,7 @@
</span><span class="cx"> visitor.append(&thisObject->m_syntaxErrorConstructor);
</span><span class="cx"> visitor.append(&thisObject->m_typeErrorConstructor);
</span><span class="cx"> visitor.append(&thisObject->m_URIErrorConstructor);
</span><ins>+ visitor.append(&thisObject->m_objectConstructor);
</ins><span class="cx"> visitor.append(&thisObject->m_promiseConstructor);
</span><span class="cx">
</span><span class="cx"> visitor.append(&thisObject->m_evalFunction);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -68,6 +68,7 @@
</span><span class="cx"> class LLIntOffsetsExtractor;
</span><span class="cx"> class Microtask;
</span><span class="cx"> class NativeErrorConstructor;
</span><ins>+class ObjectConstructor;
</ins><span class="cx"> class ProgramCodeBlock;
</span><span class="cx"> class ProgramExecutable;
</span><span class="cx"> class RegExpConstructor;
</span><span class="lines">@@ -159,6 +160,7 @@
</span><span class="cx"> WriteBarrier<NativeErrorConstructor> m_typeErrorConstructor;
</span><span class="cx"> WriteBarrier<NativeErrorConstructor> m_URIErrorConstructor;
</span><span class="cx"> WriteBarrier<JSPromiseConstructor> m_promiseConstructor;
</span><ins>+ WriteBarrier<ObjectConstructor> m_objectConstructor;
</ins><span class="cx">
</span><span class="cx"> WriteBarrier<JSFunction> m_evalFunction;
</span><span class="cx"> WriteBarrier<JSFunction> m_callFunction;
</span><span class="lines">@@ -335,6 +337,7 @@
</span><span class="cx"> RegExpConstructor* regExpConstructor() const { return m_regExpConstructor.get(); }
</span><span class="cx">
</span><span class="cx"> ErrorConstructor* errorConstructor() const { return m_errorConstructor.get(); }
</span><ins>+ ObjectConstructor* objectConstructor() const { return m_objectConstructor.get(); }
</ins><span class="cx"> NativeErrorConstructor* evalErrorConstructor() const { return m_evalErrorConstructor.get(); }
</span><span class="cx"> NativeErrorConstructor* rangeErrorConstructor() const { return m_rangeErrorConstructor.get(); }
</span><span class="cx"> NativeErrorConstructor* referenceErrorConstructor() const { return m_referenceErrorConstructor.get(); }
</span><span class="lines">@@ -591,7 +594,7 @@
</span><span class="cx">
</span><span class="cx"> inline bool JSGlobalObject::symbolTableHasProperty(PropertyName propertyName)
</span><span class="cx"> {
</span><del>- SymbolTableEntry entry = symbolTable()->inlineGet(propertyName.publicName());
</del><ins>+ SymbolTableEntry entry = symbolTable()->inlineGet(propertyName.uid());
</ins><span class="cx"> return !entry.isNull();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSObject.cpp (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSObject.cpp 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/runtime/JSObject.cpp 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> int hashSizeMask = table->compactSize - 1;
</span><span class="cx"> const HashEntry* entry = table->table;
</span><span class="cx"> for (int i = 0; i <= hashSizeMask; ++i, ++entry) {
</span><del>- if (entry->key() && (!(entry->attributes() & DontEnum) || (mode == IncludeDontEnumProperties)) && !((entry->attributes() & Function) && didReify))
</del><ins>+ if (entry->key() && (!(entry->attributes() & DontEnum) || (mode == IncludeDontEnumProperties)) && !((entry->attributes() & BuiltinOrFunction) && didReify))
</ins><span class="cx"> propertyNames.add(entry->key());
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1618,7 +1618,7 @@
</span><span class="cx"> continue;
</span><span class="cx"> PropertySlot slot(this);
</span><span class="cx"> for (HashTable::ConstIterator iter = hashTable->begin(vm); iter != hashTable->end(vm); ++iter) {
</span><del>- if (iter->attributes() & Function)
</del><ins>+ if (iter->attributes() & BuiltinOrFunction)
</ins><span class="cx"> setUpStaticFunctionSlot(globalObject()->globalExec(), *iter, this, Identifier(&vm, iter->key()), slot);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2236,6 +2236,16 @@
</span><span class="cx"> putDirect(vm, propertyName, function, attributes);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void JSObject::putDirectBuiltinFunction(VM& vm, JSGlobalObject* globalObject, const PropertyName& propertyName, FunctionExecutable* functionExecutable, unsigned attributes)
+{
+ StringImpl* name = propertyName.publicName();
+ if (!name)
+ name = vm.propertyNames->anonymous.impl();
+ ASSERT(name);
+ JSFunction* function = JSFunction::createBuiltinFunction(vm, static_cast<FunctionExecutable*>(functionExecutable), globalObject);
+ putDirect(vm, propertyName, function, attributes);
+}
+
</ins><span class="cx"> void JSObject::putDirectNativeFunctionWithoutTransition(VM& vm, JSGlobalObject* globalObject, const PropertyName& propertyName, unsigned functionLength, NativeFunction nativeFunction, Intrinsic intrinsic, unsigned attributes)
</span><span class="cx"> {
</span><span class="cx"> StringImpl* name = propertyName.publicName();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSObject.h (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSObject.h 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/runtime/JSObject.h 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -581,6 +581,7 @@
</span><span class="cx"> void putDirectUndefined(PropertyOffset offset) { locationForOffset(offset)->setUndefined(); }
</span><span class="cx">
</span><span class="cx"> void putDirectNativeFunction(VM&, JSGlobalObject*, const PropertyName&, unsigned functionLength, NativeFunction, Intrinsic, unsigned attributes);
</span><ins>+ void putDirectBuiltinFunction(VM&, JSGlobalObject*, const PropertyName&, FunctionExecutable*, unsigned attributes);
</ins><span class="cx"> void putDirectNativeFunctionWithoutTransition(VM&, JSGlobalObject*, const PropertyName&, unsigned functionLength, NativeFunction, Intrinsic, unsigned attributes);
</span><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE static bool defineOwnProperty(JSObject*, ExecState*, PropertyName, const PropertyDescriptor&, bool shouldThrow);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSSymbolTableObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSSymbolTableObject.cpp (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSSymbolTableObject.cpp 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/runtime/JSSymbolTableObject.cpp 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -64,6 +64,8 @@
</span><span class="cx"> ConcurrentJITLocker locker(thisObject->symbolTable()->m_lock);
</span><span class="cx"> SymbolTable::Map::iterator end = thisObject->symbolTable()->end(locker);
</span><span class="cx"> for (SymbolTable::Map::iterator it = thisObject->symbolTable()->begin(locker); it != end; ++it) {
</span><ins>+ if (it->key->isEmptyUnique())
+ continue;
</ins><span class="cx"> if (!(it->value.getAttributes() & DontEnum) || (mode == IncludeDontEnumProperties))
</span><span class="cx"> propertyNames.add(Identifier(exec, it->key.get()));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSSymbolTableObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSSymbolTableObject.h (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSSymbolTableObject.h 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/runtime/JSSymbolTableObject.h 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> {
</span><span class="cx"> SymbolTable& symbolTable = *object->symbolTable();
</span><span class="cx"> ConcurrentJITLocker locker(symbolTable.m_lock);
</span><del>- SymbolTable::Map::iterator iter = symbolTable.find(locker, propertyName.publicName());
</del><ins>+ SymbolTable::Map::iterator iter = symbolTable.find(locker, propertyName.uid());
</ins><span class="cx"> if (iter == symbolTable.end(locker))
</span><span class="cx"> return false;
</span><span class="cx"> SymbolTableEntry::Fast entry = iter->value;
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> {
</span><span class="cx"> SymbolTable& symbolTable = *object->symbolTable();
</span><span class="cx"> ConcurrentJITLocker locker(symbolTable.m_lock);
</span><del>- SymbolTable::Map::iterator iter = symbolTable.find(locker, propertyName.publicName());
</del><ins>+ SymbolTable::Map::iterator iter = symbolTable.find(locker, propertyName.uid());
</ins><span class="cx"> if (iter == symbolTable.end(locker))
</span><span class="cx"> return false;
</span><span class="cx"> SymbolTableEntry::Fast entry = iter->value;
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> {
</span><span class="cx"> SymbolTable& symbolTable = *object->symbolTable();
</span><span class="cx"> ConcurrentJITLocker locker(symbolTable.m_lock);
</span><del>- SymbolTable::Map::iterator iter = symbolTable.find(locker, propertyName.publicName());
</del><ins>+ SymbolTable::Map::iterator iter = symbolTable.find(locker, propertyName.uid());
</ins><span class="cx"> if (iter == symbolTable.end(locker))
</span><span class="cx"> return false;
</span><span class="cx"> SymbolTableEntry::Fast entry = iter->value;
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> {
</span><span class="cx"> SymbolTable& symbolTable = *object->symbolTable();
</span><span class="cx"> GCSafeConcurrentJITLocker locker(symbolTable.m_lock, exec->vm().heap);
</span><del>- SymbolTable::Map::iterator iter = symbolTable.find(locker, propertyName.publicName());
</del><ins>+ SymbolTable::Map::iterator iter = symbolTable.find(locker, propertyName.uid());
</ins><span class="cx"> if (iter == symbolTable.end(locker))
</span><span class="cx"> return false;
</span><span class="cx"> bool wasFat;
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx"> {
</span><span class="cx"> SymbolTable& symbolTable = *object->symbolTable();
</span><span class="cx"> ConcurrentJITLocker locker(symbolTable.m_lock);
</span><del>- SymbolTable::Map::iterator iter = symbolTable.find(locker, propertyName.publicName());
</del><ins>+ SymbolTable::Map::iterator iter = symbolTable.find(locker, propertyName.uid());
</ins><span class="cx"> if (iter == symbolTable.end(locker))
</span><span class="cx"> return false;
</span><span class="cx"> SymbolTableEntry& entry = iter->value;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeLookupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Lookup.cpp (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Lookup.cpp 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/runtime/Lookup.cpp 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> bool setUpStaticFunctionSlot(ExecState* exec, const HashEntry* entry, JSObject* thisObj, PropertyName propertyName, PropertySlot& slot)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(thisObj->globalObject());
</span><del>- ASSERT(entry->attributes() & Function);
</del><ins>+ ASSERT(entry->attributes() & BuiltinOrFunction);
</ins><span class="cx"> VM& vm = exec->vm();
</span><span class="cx"> unsigned attributes;
</span><span class="cx"> PropertyOffset offset = thisObj->getDirectOffset(vm, propertyName, attributes);
</span><span class="lines">@@ -79,9 +79,13 @@
</span><span class="cx"> if (thisObj->staticFunctionsReified())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- thisObj->putDirectNativeFunction(
- vm, thisObj->globalObject(), propertyName, entry->functionLength(),
- entry->function(), entry->intrinsic(), entry->attributes());
</del><ins>+ if (entry->attributes() & Builtin)
+ thisObj->putDirectBuiltinFunction(vm, thisObj->globalObject(), propertyName, entry->builtinGenerator()(vm), entry->attributes());
+ else {
+ thisObj->putDirectNativeFunction(
+ vm, thisObj->globalObject(), propertyName, entry->functionLength(),
+ entry->function(), entry->intrinsic(), entry->attributes());
+ }
</ins><span class="cx"> offset = thisObj->getDirectOffset(vm, propertyName, attributes);
</span><span class="cx"> ASSERT(isValidOffset(offset));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeLookuph"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Lookup.h (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Lookup.h 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/runtime/Lookup.h 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> // ie. typedef JSValue (*GetFunction)(ExecState*, JSObject* baseObject)
</span><span class="cx"> typedef PropertySlot::GetValueFunc GetFunction;
</span><span class="cx"> typedef PutPropertySlot::PutValueFunc PutFunction;
</span><ins>+ typedef FunctionExecutable* (*BuiltinGenerator)(VM&);
</ins><span class="cx">
</span><span class="cx"> class HashEntry {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="lines">@@ -68,11 +69,12 @@
</span><span class="cx"> return m_intrinsic;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ BuiltinGenerator builtinGenerator() const { ASSERT(m_attributes & Builtin); return m_u.builtinGenerator.generatorValue; }
</ins><span class="cx"> NativeFunction function() const { ASSERT(m_attributes & Function); return m_u.function.functionValue; }
</span><span class="cx"> unsigned char functionLength() const { ASSERT(m_attributes & Function); return static_cast<unsigned char>(m_u.function.length); }
</span><span class="cx">
</span><del>- GetFunction propertyGetter() const { ASSERT(!(m_attributes & Function)); return m_u.property.get; }
- PutFunction propertyPutter() const { ASSERT(!(m_attributes & Function)); return m_u.property.put; }
</del><ins>+ GetFunction propertyGetter() const { ASSERT(!(m_attributes & BuiltinOrFunction)); return m_u.property.get; }
+ PutFunction propertyPutter() const { ASSERT(!(m_attributes & BuiltinOrFunction)); return m_u.property.put; }
</ins><span class="cx">
</span><span class="cx"> intptr_t lexerValue() const { ASSERT(!m_attributes); return m_u.lexer.value; }
</span><span class="cx">
</span><span class="lines">@@ -94,6 +96,10 @@
</span><span class="cx"> intptr_t length; // number of arguments for function
</span><span class="cx"> } function;
</span><span class="cx"> struct {
</span><ins>+ BuiltinGenerator generatorValue;
+ intptr_t unused;
+ } builtinGenerator;
+ struct {
</ins><span class="cx"> GetFunction get;
</span><span class="cx"> PutFunction put;
</span><span class="cx"> } property;
</span><span class="lines">@@ -209,7 +215,7 @@
</span><span class="cx"> private:
</span><span class="cx"> ALWAYS_INLINE const HashEntry* entry(PropertyName propertyName) const
</span><span class="cx"> {
</span><del>- StringImpl* impl = propertyName.publicName();
</del><ins>+ StringImpl* impl = propertyName.uid();
</ins><span class="cx"> if (!impl)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="lines">@@ -249,7 +255,7 @@
</span><span class="cx"> if (!entry) // not found, forward to parent
</span><span class="cx"> return ParentImp::getOwnPropertySlot(thisObj, exec, propertyName, slot);
</span><span class="cx">
</span><del>- if (entry->attributes() & Function)
</del><ins>+ if (entry->attributes() & BuiltinOrFunction)
</ins><span class="cx"> return setUpStaticFunctionSlot(exec, entry, thisObj, propertyName, slot);
</span><span class="cx">
</span><span class="cx"> slot.setCacheableCustom(thisObj, entry->attributes(), entry->propertyGetter());
</span><span class="lines">@@ -286,7 +292,7 @@
</span><span class="cx"> if (!entry) // not found, forward to parent
</span><span class="cx"> return ParentImp::getOwnPropertySlot(thisObj, exec, propertyName, slot);
</span><span class="cx">
</span><del>- ASSERT(!(entry->attributes() & Function));
</del><ins>+ ASSERT(!(entry->attributes() & BuiltinOrFunction));
</ins><span class="cx">
</span><span class="cx"> slot.setCacheableCustom(thisObj, entry->attributes(), entry->propertyGetter());
</span><span class="cx"> return true;
</span><span class="lines">@@ -295,7 +301,7 @@
</span><span class="cx"> inline void putEntry(ExecState* exec, const HashEntry* entry, JSObject* base, PropertyName propertyName, JSValue value, PutPropertySlot& slot)
</span><span class="cx"> {
</span><span class="cx"> // If this is a function put it as an override property.
</span><del>- if (entry->attributes() & Function) {
</del><ins>+ if (entry->attributes() & BuiltinOrFunction) {
</ins><span class="cx"> if (JSObject* thisObject = jsDynamicCast<JSObject*>(slot.thisValue()))
</span><span class="cx"> thisObject->putDirect(exec->vm(), propertyName, value);
</span><span class="cx"> } else if (!(entry->attributes() & ReadOnly)) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeNativeErrorConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/NativeErrorConstructor.cpp (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/NativeErrorConstructor.cpp 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/runtime/NativeErrorConstructor.cpp 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -38,6 +38,20 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void NativeErrorConstructor::finishCreation(VM& vm, JSGlobalObject* globalObject, Structure* prototypeStructure, const String& name)
+{
+ Base::finishCreation(vm, name);
+ ASSERT(inherits(info()));
+
+ NativeErrorPrototype* prototype = NativeErrorPrototype::create(vm, globalObject, prototypeStructure, name, this);
+
+ putDirect(vm, vm.propertyNames->length, jsNumber(1), DontDelete | ReadOnly | DontEnum); // ECMA 15.11.7.5
+ putDirect(vm, vm.propertyNames->prototype, prototype, DontDelete | ReadOnly | DontEnum);
+ m_errorStructure.set(vm, this, ErrorInstance::createStructure(vm, globalObject, prototype));
+ ASSERT(m_errorStructure);
+ ASSERT(m_errorStructure->isObject());
+}
+
</ins><span class="cx"> void NativeErrorConstructor::visitChildren(JSCell* cell, SlotVisitor& visitor)
</span><span class="cx"> {
</span><span class="cx"> NativeErrorConstructor* thisObject = jsCast<NativeErrorConstructor*>(cell);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeNativeErrorConstructorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/NativeErrorConstructor.h (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/NativeErrorConstructor.h 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/runtime/NativeErrorConstructor.h 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -51,20 +51,8 @@
</span><span class="cx"> Structure* errorStructure() { return m_errorStructure.get(); }
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- void finishCreation(VM& vm, JSGlobalObject* globalObject, Structure* prototypeStructure, const String& name)
- {
- Base::finishCreation(vm, name);
- ASSERT(inherits(info()));
</del><ins>+ void finishCreation(VM&, JSGlobalObject*, Structure* prototypeStructure, const String& name);
</ins><span class="cx">
</span><del>- NativeErrorPrototype* prototype = NativeErrorPrototype::create(vm, globalObject, prototypeStructure, name, this);
-
- putDirect(vm, vm.propertyNames->length, jsNumber(1), DontDelete | ReadOnly | DontEnum); // ECMA 15.11.7.5
- putDirect(vm, vm.propertyNames->prototype, prototype, DontDelete | ReadOnly | DontEnum);
- m_errorStructure.set(vm, this, ErrorInstance::createStructure(vm, globalObject, prototype));
- ASSERT(m_errorStructure);
- ASSERT(m_errorStructure->isObject());
- }
-
</del><span class="cx"> private:
</span><span class="cx"> NativeErrorConstructor(VM&, Structure*);
</span><span class="cx"> static const unsigned StructureFlags = OverridesVisitChildren | InternalFunction::StructureFlags;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimePropertySloth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/PropertySlot.h (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/PropertySlot.h 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/runtime/PropertySlot.h 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -36,13 +36,15 @@
</span><span class="cx"> // ECMA 262-3 8.6.1
</span><span class="cx"> // Property attributes
</span><span class="cx"> enum Attribute {
</span><del>- None = 0,
- ReadOnly = 1 << 1, // property can be only read, not written
- DontEnum = 1 << 2, // property doesn't appear in (for .. in ..)
- DontDelete = 1 << 3, // property can't be deleted
- Function = 1 << 4, // property is a function - only used by static hashtables
- Accessor = 1 << 5, // property is a getter/setter
- CustomAccessor = 1 << 6,
</del><ins>+ None = 0,
+ ReadOnly = 1 << 1, // property can be only read, not written
+ DontEnum = 1 << 2, // property doesn't appear in (for .. in ..)
+ DontDelete = 1 << 3, // property can't be deleted
+ Function = 1 << 4, // property is a function - only used by static hashtables
+ Accessor = 1 << 5, // property is a getter/setter
+ CustomAccessor = 1 << 6,
+ Builtin = 1 << 7, // property is a builtin function - only used by static hashtables
+ BuiltinOrFunction = Builtin | Function, // helper only used by static hashtables
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class PropertySlot {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VM.cpp (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VM.cpp 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/runtime/VM.cpp 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "ArgList.h"
</span><span class="cx"> #include "ArityCheckFailReturnThunks.h"
</span><span class="cx"> #include "ArrayBufferNeuteringWatchpoint.h"
</span><ins>+#include "BuiltinExecutables.h"
</ins><span class="cx"> #include "CodeBlock.h"
</span><span class="cx"> #include "CodeCache.h"
</span><span class="cx"> #include "CommonIdentifiers.h"
</span><span class="lines">@@ -68,13 +69,16 @@
</span><span class="cx"> #include "Lookup.h"
</span><span class="cx"> #include "MapData.h"
</span><span class="cx"> #include "Nodes.h"
</span><ins>+#include "Parser.h"
</ins><span class="cx"> #include "ParserArena.h"
</span><ins>+#include "PropertyMapHashTable.h"
</ins><span class="cx"> #include "RegExpCache.h"
</span><span class="cx"> #include "RegExpObject.h"
</span><span class="cx"> #include "SimpleTypedArrayController.h"
</span><span class="cx"> #include "SourceProviderCache.h"
</span><span class="cx"> #include "StrictEvalActivation.h"
</span><span class="cx"> #include "StrongInlines.h"
</span><ins>+#include "StructureInlines.h"
</ins><span class="cx"> #include "UnlinkedCodeBlock.h"
</span><span class="cx"> #include "WeakMapData.h"
</span><span class="cx"> #include <wtf/ProcessID.h>
</span><span class="lines">@@ -226,6 +230,7 @@
</span><span class="cx"> , m_inDefineOwnProperty(false)
</span><span class="cx"> , m_codeCache(CodeCache::create())
</span><span class="cx"> , m_enabledProfiler(nullptr)
</span><ins>+ , m_builtinExecutables(BuiltinExecutables::create(*this))
</ins><span class="cx"> {
</span><span class="cx"> interpreter = new Interpreter(*this);
</span><span class="cx"> StackBounds stack = wtfThreadData().stack();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VM.h (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VM.h 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/JavaScriptCore/runtime/VM.h 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx"> #include "PrivateName.h"
</span><span class="cx"> #include "PrototypeMap.h"
</span><span class="cx"> #include "SmallStrings.h"
</span><ins>+#include "SourceCode.h"
</ins><span class="cx"> #include "Strong.h"
</span><span class="cx"> #include "ThunkGenerators.h"
</span><span class="cx"> #include "TypedArrayController.h"
</span><span class="lines">@@ -69,6 +70,7 @@
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="cx"> class ArityCheckFailReturnThunks;
</span><ins>+ class BuiltinExecutables;
</ins><span class="cx"> class CodeBlock;
</span><span class="cx"> class CodeCache;
</span><span class="cx"> class CommonIdentifiers;
</span><span class="lines">@@ -497,6 +499,8 @@
</span><span class="cx"> void registerWatchpointForImpureProperty(const Identifier&, Watchpoint*);
</span><span class="cx"> // FIXME: Use AtomicString once it got merged with Identifier.
</span><span class="cx"> JS_EXPORT_PRIVATE void addImpureProperty(const String&);
</span><ins>+
+ BuiltinExecutables* builtinExecutables() { return m_builtinExecutables.get(); }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> friend class LLIntOffsetsExtractor;
</span><span class="lines">@@ -537,10 +541,9 @@
</span><span class="cx"> JSValue m_exception;
</span><span class="cx"> bool m_inDefineOwnProperty;
</span><span class="cx"> OwnPtr<CodeCache> m_codeCache;
</span><ins>+ LegacyProfiler* m_enabledProfiler;
+ OwnPtr<BuiltinExecutables> m_builtinExecutables;
</ins><span class="cx"> RefCountedArray<StackFrame> m_exceptionStack;
</span><del>-
- LegacyProfiler* m_enabledProfiler;
-
</del><span class="cx"> HashMap<String, RefPtr<WatchpointSet>> m_impurePropertyWatchpointSets;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcecmakegtestCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/gtest/CMakeLists.txt (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/gtest/CMakeLists.txt 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Source/cmake/gtest/CMakeLists.txt 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -6,6 +6,7 @@
</span><span class="cx"> include_directories(${THIRDPARTY_DIR}/gtest
</span><span class="cx"> ${THIRDPARTY_DIR}/gtest/include
</span><span class="cx"> ${JAVASCRIPTCORE_DIR}
</span><ins>+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}
</ins><span class="cx"> ${WTF_DIR}
</span><span class="cx"> )
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Tools/ChangeLog 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-02-11 Oliver Hunt <oliver@apple.com>
+
+ Make it possible to implement JS builtins in JS
+ https://bugs.webkit.org/show_bug.cgi?id=127887
+
+ Reviewed by Michael Saboff.
+
+ CMake updates
+
+ * DumpRenderTree/CMakeLists.txt:
+ * WebKitTestRunner/CMakeLists.txt:
+ * WinCELauncher/CMakeLists.txt:
+
</ins><span class="cx"> 2014-02-11 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> It should be possible to force copy-webkitlibraries-blahblah to copy things regardless of timestamp
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/CMakeLists.txt (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/CMakeLists.txt 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Tools/DumpRenderTree/CMakeLists.txt 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx"> ${JAVASCRIPTCORE_DIR}/profiler
</span><span class="cx"> ${JAVASCRIPTCORE_DIR}/runtime
</span><span class="cx"> ${JAVASCRIPTCORE_DIR}/ForwardingHeaders
</span><ins>+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}
</ins><span class="cx"> ${TOOLS_DIR}/DumpRenderTree
</span><span class="cx"> ${WTF_DIR}
</span><span class="cx"> ${CMAKE_SOURCE_DIR}/Source
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/CMakeLists.txt (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/CMakeLists.txt 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Tools/WebKitTestRunner/CMakeLists.txt 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> ${WEBKIT_TESTRUNNER_DIR}/InjectedBundle/atk
</span><span class="cx"> ${JAVASCRIPTCORE_DIR}
</span><span class="cx"> ${JAVASCRIPTCORE_DIR}/ForwardingHeaders
</span><ins>+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}
</ins><span class="cx"> ${WEBCORE_DIR}/editing
</span><span class="cx"> ${WEBCORE_DIR}/platform
</span><span class="cx"> ${WEBCORE_DIR}/platform/graphics
</span></span></pre></div>
<a id="trunkToolsWinCELauncherCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WinCELauncher/CMakeLists.txt (163959 => 163960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WinCELauncher/CMakeLists.txt 2014-02-12 17:10:25 UTC (rev 163959)
+++ trunk/Tools/WinCELauncher/CMakeLists.txt 2014-02-12 17:14:23 UTC (rev 163960)
</span><span class="lines">@@ -6,6 +6,7 @@
</span><span class="cx"> "${WEBCORE_DIR}/platform/network"
</span><span class="cx"> "${WEBCORE_DIR}/platform/text"
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}"
</span><ins>+ "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
</ins><span class="cx"> "${WTF_DIR}"
</span><span class="cx"> "${DERIVED_SOURCES_DIR}"
</span><span class="cx"> "${CMAKE_BINARY_DIR}"
</span></span></pre>
</div>
</div>
</body>
</html>