Changeset 157955 in webkit

Timestamp:

Oct 24, 2013, 2:28:39 PM (13 years ago)

Author:

Lucas Forschler

Message:

Merged r154303. <rdar://problem/15109405>

Location:

branches/safari-537.73-branch/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• dfg/DFGSpeculativeJIT32_64.cpp (modified) (1 diff)

branches/safari-537.73-branch/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-10-24  Lucas Forschler  <lforschler@apple.com>
+
+        Merge r154303
+
+    2013-08-18  Gavin Barraclough  <barraclough@apple.com>
+
+            https://bugs.webkit.org/show_bug.cgi?id=119995
+            Start removing custom implementations of getOwnPropertyDescriptor
+
+            Reviewed by Oliver Hunt.
+
+            This can now typically implemented in terms of getOwnPropertySlot.
+            Add a macro to PropertyDescriptor to define an implementation of GOPD in terms of GOPS.
+            Switch over most classes in JSC & the WebCore bindings generator to use this.
+
+            * API/JSCallbackObjectFunctions.h:
+            * debugger/DebuggerActivation.cpp:
+            * runtime/Arguments.cpp:
+            * runtime/ArrayConstructor.cpp:
+            * runtime/ArrayPrototype.cpp:
+            * runtime/BooleanPrototype.cpp:
+            * runtime/DateConstructor.cpp:
+            * runtime/DatePrototype.cpp:
+            * runtime/ErrorPrototype.cpp:
+            * runtime/JSActivation.cpp:
+            * runtime/JSArray.cpp:
+            * runtime/JSArrayBuffer.cpp:
+            * runtime/JSArrayBufferView.cpp:
+            * runtime/JSCell.cpp:
+            * runtime/JSDataView.cpp:
+            * runtime/JSDataViewPrototype.cpp:
+            * runtime/JSFunction.cpp:
+            * runtime/JSGenericTypedArrayViewInlines.h:
+            * runtime/JSNotAnObject.cpp:
+            * runtime/JSONObject.cpp:
+            * runtime/JSObject.cpp:
+            * runtime/NamePrototype.cpp:
+            * runtime/NumberConstructor.cpp:
+            * runtime/NumberPrototype.cpp:
+            * runtime/ObjectConstructor.cpp:
+                - Implement getOwnPropertySlot in terms of GET_OWN_PROPERTY_DESCRIPTOR_IMPL.
+            * runtime/PropertyDescriptor.h:
+                - Added GET_OWN_PROPERTY_DESCRIPTOR_IMPL macro.
+            * runtime/PropertySlot.h:
+            (JSC::PropertySlot::isValue):
+            (JSC::PropertySlot::isGetter):
+            (JSC::PropertySlot::isCustom):
+            (JSC::PropertySlot::isCacheableValue):
+            (JSC::PropertySlot::isCacheableGetter):
+            (JSC::PropertySlot::isCacheableCustom):
+            (JSC::PropertySlot::attributes):
+            (JSC::PropertySlot::getterSetter):
+                - Add accessors necessary to convert PropertySlot to descriptor.
+            * runtime/RegExpConstructor.cpp:
+            * runtime/RegExpMatchesArray.cpp:
+            * runtime/RegExpMatchesArray.h:
+            * runtime/RegExpObject.cpp:
+            * runtime/RegExpPrototype.cpp:
+            * runtime/StringConstructor.cpp:
+            * runtime/StringObject.cpp:
+                - Implement getOwnPropertySlot in terms of GET_OWN_PROPERTY_DESCRIPTOR_IMPL.
+
 2013-10-24  Oliver Hunt  <oliver@apple.com>
 

branches/safari-537.73-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp

@@ -1107 +1107 @@
     switch (info.registerFormat()) {
     case DataFormatNone: {
+        if (info.spillFormat() == DataFormatInteger || info.spillFormat() == DataFormatDouble) {
+            terminateSpeculativeExecution(Uncountable, JSValueRegs(), 0);
+            return allocate();
+        }
 
         if (edge->hasConstant()) {