Title: [172181] trunk/Source/_javascript_Core
- Revision
- 172181
- Author
- fpi...@apple.com
- Date
- 2014-08-06 15:52:08 -0700 (Wed, 06 Aug 2014)
Log Message
Silence a debug assertion.
Reviewed by Mark Hahnenberg.
* runtime/JSPropertyNameEnumerator.h:
(JSC::JSPropertyNameEnumerator::cachedStructure):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (172180 => 172181)
--- trunk/Source/_javascript_Core/ChangeLog 2014-08-06 21:53:17 UTC (rev 172180)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-08-06 22:52:08 UTC (rev 172181)
@@ -1,5 +1,14 @@
2014-08-06 Filip Pizlo <fpi...@apple.com>
+ Silence a debug assertion.
+
+ Reviewed by Mark Hahnenberg.
+
+ * runtime/JSPropertyNameEnumerator.h:
+ (JSC::JSPropertyNameEnumerator::cachedStructure):
+
+2014-08-06 Filip Pizlo <fpi...@apple.com>
+
Fix 32-bit build.
* jit/JITOpcodes32_64.cpp:
Modified: trunk/Source/_javascript_Core/runtime/JSPropertyNameEnumerator.h (172180 => 172181)
--- trunk/Source/_javascript_Core/runtime/JSPropertyNameEnumerator.h 2014-08-06 21:53:17 UTC (rev 172180)
+++ trunk/Source/_javascript_Core/runtime/JSPropertyNameEnumerator.h 2014-08-06 22:52:08 UTC (rev 172181)
@@ -68,7 +68,12 @@
StructureChain* cachedPrototypeChain() const { return m_prototypeChain.get(); }
void setCachedPrototypeChain(VM& vm, StructureChain* prototypeChain) { return m_prototypeChain.set(vm, this, prototypeChain); }
- Structure* cachedStructure(VM& vm) const { return vm.heap.structureIDTable().get(m_cachedStructureID); }
+ Structure* cachedStructure(VM& vm) const
+ {
+ if (!m_cachedStructureID)
+ return nullptr;
+ return vm.heap.structureIDTable().get(m_cachedStructureID);
+ }
StructureID cachedStructureID() const { return m_cachedStructureID; }
uint32_t cachedInlineCapacity() const { return m_cachedInlineCapacity; }
static ptrdiff_t cachedStructureIDOffset() { return OBJECT_OFFSETOF(JSPropertyNameEnumerator, m_cachedStructureID); }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
