Changeset 40993 in webkit for trunk/JavaScriptCore/bytecode/CodeBlock.h

Timestamp:

Feb 13, 2009, 3:28:04 PM (16 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2009-02-13 Geoffrey Garen <​[email protected]>

Reviewed by Darin Adler.

Fixed <rdar://problem/6584057> Optimize sort by JS numeric comparison
function not to run the comparison function

• bytecode/CodeBlock.cpp: (JSC::CodeBlock::CodeBlock):
• bytecode/CodeBlock.h: (JSC::CodeBlock::setIsNumericCompareFunction): (JSC::CodeBlock::isNumericCompareFunction): Added the ability to track whether a CodeBlock performs a sort-like numeric comparison.

• bytecompiler/BytecodeGenerator.cpp: (JSC::BytecodeGenerator::generate): Set the isNumericCompareFunction bit after compiling.

• parser/Nodes.cpp: (JSC::FunctionBodyNode::emitBytecode): Fixed a bug that caused us to codegen an extra return at the end of all functions (eek!), since this made it harder / weirder to detect the numeric comparison pattern in bytecode.

• runtime/ArrayPrototype.cpp: (JSC::arrayProtoFuncSort): Use the isNumericCompareFunction bit to do a faster sort if we can.

• runtime/FunctionConstructor.cpp: (JSC::extractFunctionBody): (JSC::constructFunction):
• runtime/FunctionConstructor.h: Renamed and exported extractFunctionBody for use in initializing lazyNumericCompareFunction.

• runtime/JSArray.cpp: (JSC::compareNumbersForQSort): (JSC::compareByStringPairForQSort): (JSC::JSArray::sortNumeric): (JSC::JSArray::sort):
• runtime/JSArray.h: Added a fast numeric sort. Renamed ArrayQSortPair to be more specific since we do different kinds of qsort now.

• runtime/JSGlobalData.cpp: (JSC::JSGlobalData::JSGlobalData): (JSC::JSGlobalData::numericCompareFunction): (JSC::JSGlobalData::ClientData::~ClientData):
• runtime/JSGlobalData.h: Added helper data for computing the isNumericCompareFunction bit.

LayoutTests:

2009-02-13 Geoffrey Garen <​[email protected]>

Reviewed by Sam Weinig.

Added a test for an edge case in <rdar://problem/6584057>.

• fast/js/resources/sort-non-numbers.js: Added.
• fast/js/sort-non-numbers.html: Added.
• fast/js/sort-non-numbers-expected.txt: Added.

File:

• trunk/JavaScriptCore/bytecode/CodeBlock.h (modified) (2 diffs)

trunk/JavaScriptCore/bytecode/CodeBlock.h

@@ -315 +315 @@
             return binaryChop<CallReturnOffsetToBytecodeIndex, unsigned, getCallReturnOffset>(m_exceptionInfo->m_callReturnIndexVector.begin(), m_exceptionInfo->m_callReturnIndexVector.size(), m_jitCode.code.offsetOf(nativePC))->bytecodeIndex;
         }
+        
+        void setIsNumericCompareFunction(bool isNumericCompareFunction) { m_isNumericCompareFunction = isNumericCompareFunction; }
+        bool isNumericCompareFunction() { return m_isNumericCompareFunction; }
 
         bool functionRegisterForBytecodeOffset(unsigned bytecodeOffset, int& functionRegisterIndex);
@@ -480 +483 @@
         bool m_usesEval;
         bool m_usesArguments;
+        bool m_isNumericCompareFunction;
 
         CodeType m_codeType;