Title: [156504] trunk/Source/_javascript_Core
- Revision
- 156504
- Author
- [email protected]
- Date
- 2013-09-26 15:20:46 -0700 (Thu, 26 Sep 2013)
Log Message
Attempt to fix the FTL build.
* ftl/FTLAbstractHeap.cpp:
(JSC::FTL::IndexedAbstractHeap::atSlow):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (156503 => 156504)
--- trunk/Source/_javascript_Core/ChangeLog 2013-09-26 22:19:07 UTC (rev 156503)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-09-26 22:20:46 UTC (rev 156504)
@@ -1,3 +1,10 @@
+2013-09-26 Anders Carlsson <[email protected]>
+
+ Attempt to fix the FTL build.
+
+ * ftl/FTLAbstractHeap.cpp:
+ (JSC::FTL::IndexedAbstractHeap::atSlow):
+
2013-09-26 Andreas Kling <[email protected]>
Pass VM instead of ExecState to many finishCreation() functions.
Modified: trunk/Source/_javascript_Core/ftl/FTLAbstractHeap.cpp (156503 => 156504)
--- trunk/Source/_javascript_Core/ftl/FTLAbstractHeap.cpp 2013-09-26 22:19:07 UTC (rev 156503)
+++ trunk/Source/_javascript_Core/ftl/FTLAbstractHeap.cpp 2013-09-26 22:20:46 UTC (rev 156504)
@@ -102,16 +102,14 @@
if (UNLIKELY(!m_largeIndices))
m_largeIndices = adoptPtr(new MapType());
-
- MapType::const_iterator iter = m_largeIndices->find(index);
- if (iter != m_largeIndices->end())
- return *iter->value;
-
- OwnPtr<AbstractField> field = adoptPtr(new AbstractField());
- AbstractField* result = field.get();
- initialize(*result, index);
- m_largeIndices->add(index, field.release());
- return *result;
+
+ std::unique_ptr<AbstractField>& field = m_largeIndices->add(index, nullptr).iterator->value;
+ if (!field) {
+ field = std::make_unique<AbstractField>();
+ initialize(*field, index);
+ }
+
+ return *field;
}
void IndexedAbstractHeap::initialize(AbstractField& field, ptrdiff_t signedIndex)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
