Changeset 105217 in webkit for trunk/Source/JavaScriptCore/dfg/DFGAbstractState.cpp

Timestamp:

Jan 17, 2012, 5:11:16 PM (13 years ago)

Author:

[email protected]

Message:

Uint8ClampedArray support
​https://bugs.webkit.org/show_bug.cgi?id=74455

Reviewed by Filip Pizlo.

Source/JavaScriptCore:

• GNUmakefile.list.am:
• JavaScriptCore.xcodeproj/project.pbxproj:
• bytecode/PredictedType.cpp:

(JSC::predictionToString):
(JSC::predictionFromClassInfo):

• bytecode/PredictedType.h:

(JSC::isUint8ClampedArrayPrediction):
(JSC::isActionableMutableArrayPrediction):

• dfg/DFGAbstractState.cpp:

(JSC::DFG::AbstractState::initialize):
(JSC::DFG::AbstractState::execute):

• dfg/DFGNode.h:

(JSC::DFG::Node::shouldSpeculateUint8ClampedArray):

• dfg/DFGPropagator.cpp:

(JSC::DFG::Propagator::propagateNodePredictions):
(JSC::DFG::Propagator::fixupNode):
(JSC::DFG::Propagator::performNodeCSE):

• dfg/DFGSpeculativeJIT.cpp:

(JSC::DFG::SpeculativeJIT::checkArgumentTypes):
(JSC::DFG::clampDoubleToByte):
(JSC::DFG::compileClampIntegerToByte):
(JSC::DFG::SpeculativeJIT::compilePutByValForByteArray):
(JSC::DFG::SpeculativeJIT::compilePutByValForIntTypedArray):
(JSC::DFG::SpeculativeJIT::compileGetIndexedPropertyStorage):

• dfg/DFGSpeculativeJIT.h:
• dfg/DFGSpeculativeJIT32_64.cpp:

(JSC::DFG::SpeculativeJIT::compile):

• dfg/DFGSpeculativeJIT64.cpp:

(JSC::DFG::SpeculativeJIT::compile):

• runtime/JSCell.h:
• runtime/JSGlobalData.h:
• wtf/Forward.h:
• wtf/Uint8Array.h:
• wtf/Uint8ClampedArray.h: Added.

(WTF::Uint8ClampedArray::set):
(WTF::Uint8ClampedArray::create):
(WTF::Uint8ClampedArray::Uint8ClampedArray):
(WTF::Uint8ClampedArray::subarray):

Source/WebCore:

Test: fast/js/dfg-uint8clampedarray.html

• CMakeLists.txt:
• DerivedSources.cpp:
• DerivedSources.make:
• DerivedSources.pri:
• ForwardingHeaders/wtf/Uint8ClampedArray.h: Added.
• GNUmakefile.list.am:
• Target.pri:
• UseJSC.cmake:
• WebCore.xcodeproj/project.pbxproj:
• bindings/js/JSBindingsAllInOne.cpp:
• bindings/js/JSDOMWindowCustom.cpp:
• bindings/js/JSUint8ClampedArrayCustom.cpp: Added.

(WebCore::JSUint8ClampedArray::indexSetter):
(WebCore::toJS):
(WebCore::JSUint8ClampedArray::set):
(WebCore::JSUint8ClampedArrayConstructor::constructJSUint8ClampedArray):

• bindings/scripts/CodeGeneratorJS.pm:

(IsTypedArrayType):
(GenerateHeader):

• html/canvas/Uint8ClampedArray.idl: Added.
• page/DOMWindow.idl:

Source/WTF:

• WTF.pro:

LayoutTests:

• fast/canvas/webgl/array-unit-tests-expected.txt:
• fast/canvas/webgl/array-unit-tests.html:
• fast/dom/Window/script-tests/window-property-descriptors.js:
• fast/dom/Window/window-properties.html:
• fast/dom/script-tests/constructed-objects-prototypes.js:

(constructorPropertiesOnWindow):

• fast/dom/script-tests/prototype-inheritance-2.js:

(constructorNamesForWindow):

• fast/js/dfg-uint8clampedarray-expected.txt: Added.
• fast/js/dfg-uint8clampedarray.html: Added.
• fast/js/script-tests/dfg-uint8clampedarray.js: Added.

(getter1):
(setter1):
(getter2):
(setter2):
(getter3):
(setter3):
(getter4):
(setter4):
(getters.getter1.a):
(.a):
(setters.setter1.a):
(safeGetter):
(safeSetter):

• fast/js/script-tests/global-constructors.js:
• platform/chromium/fast/canvas/webgl/array-unit-tests-expected.txt: Copied from LayoutTests/fast/canvas/webgl/array-unit-tests-expected.txt.
• platform/chromium/test_expectations.txt:

File:

• trunk/Source/JavaScriptCore/dfg/DFGAbstractState.cpp (modified) (5 diffs)

trunk/Source/JavaScriptCore/dfg/DFGAbstractState.cpp

@@ -122 +122 @@
         else if (isUint8ArrayPrediction(prediction))
             root->valuesAtHead.argument(i).set(PredictUint8Array);
+        else if (isUint8ClampedArrayPrediction(prediction))
+            root->valuesAtHead.argument(i).set(PredictUint8ClampedArray);
         else if (isUint16ArrayPrediction(prediction))
             root->valuesAtHead.argument(i).set(PredictUint16Array);
@@ -449 +451 @@
             break;
         }
+        if (m_graph[node.child1()].shouldSpeculateUint8ClampedArray()) {
+            forNode(node.child1()).filter(PredictUint8ClampedArray);
+            forNode(node.child2()).filter(PredictInt32);
+            forNode(nodeIndex).set(PredictInt32);
+            break;
+        }
         if (m_graph[node.child1()].shouldSpeculateUint16Array()) {
             forNode(node.child1()).filter(PredictUint16Array);
@@ -519 +527 @@
         if (m_graph[node.child1()].shouldSpeculateUint8Array()) {
             forNode(node.child1()).filter(PredictUint8Array);
+            forNode(node.child2()).filter(PredictInt32);
+            forNode(node.child3()).filter(PredictNumber);
+            break;
+        }
+        if (m_graph[node.child1()].shouldSpeculateUint8ClampedArray()) {
+            forNode(node.child1()).filter(PredictUint8ClampedArray);
             forNode(node.child2()).filter(PredictInt32);
             forNode(node.child3()).filter(PredictNumber);
@@ -730 +744 @@
         forNode(nodeIndex).set(PredictInt32);
         break;
+    case GetUint8ClampedArrayLength:
+        forNode(node.child1()).filter(PredictUint8ClampedArray);
+        forNode(nodeIndex).set(PredictInt32);
+        break;
     case GetUint16ArrayLength:
         forNode(node.child1()).filter(PredictUint16Array);
@@ -796 +814 @@
         if (m_graph[node.child1()].shouldSpeculateUint8Array()) {
             forNode(node.child1()).filter(PredictUint8Array);
+            forNode(nodeIndex).clear();
+            break;
+        }
+        if (m_graph[node.child1()].shouldSpeculateUint8ClampedArray()) {
+            forNode(node.child1()).filter(PredictUint8ClampedArray);
             forNode(nodeIndex).clear();
             break;