Title: [207104] releases/WebKitGTK/webkit-2.14/Source/bmalloc
- Revision
- 207104
- Author
- [email protected]
- Date
- 2016-10-11 05:33:27 -0700 (Tue, 11 Oct 2016)
Log Message
Merge r206380 - Avoid implicit conversion from iterator to pointer
https://bugs.webkit.org/show_bug.cgi?id=162482
Patch by Yoshiaki Jitsukawa <[email protected]> on 2016-09-26
Reviewed by Geoffrey Garen.
Not every STL supporting such conversion, we should get a pointer explicitly.
* bmalloc/Chunk.h:
(bmalloc::Chunk::lines):
(bmalloc::Chunk::pages):
* bmalloc/FixedVector.h:
(bmalloc::FixedVector::begin):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.14/Source/bmalloc/ChangeLog (207103 => 207104)
--- releases/WebKitGTK/webkit-2.14/Source/bmalloc/ChangeLog 2016-10-11 12:32:47 UTC (rev 207103)
+++ releases/WebKitGTK/webkit-2.14/Source/bmalloc/ChangeLog 2016-10-11 12:33:27 UTC (rev 207104)
@@ -1,3 +1,18 @@
+2016-09-26 Yoshiaki Jitsukawa <[email protected]>
+
+ Avoid implicit conversion from iterator to pointer
+ https://bugs.webkit.org/show_bug.cgi?id=162482
+
+ Reviewed by Geoffrey Garen.
+
+ Not every STL supporting such conversion, we should get a pointer explicitly.
+
+ * bmalloc/Chunk.h:
+ (bmalloc::Chunk::lines):
+ (bmalloc::Chunk::pages):
+ * bmalloc/FixedVector.h:
+ (bmalloc::FixedVector::begin):
+
2016-08-31 Filip Pizlo <[email protected]>
Butterflies should be allocated in Auxiliary MarkedSpace instead of CopiedSpace and we should rewrite as much of the GC as needed to make this not a regression
Modified: releases/WebKitGTK/webkit-2.14/Source/bmalloc/bmalloc/Chunk.h (207103 => 207104)
--- releases/WebKitGTK/webkit-2.14/Source/bmalloc/bmalloc/Chunk.h 2016-10-11 12:32:47 UTC (rev 207103)
+++ releases/WebKitGTK/webkit-2.14/Source/bmalloc/bmalloc/Chunk.h 2016-10-11 12:33:27 UTC (rev 207104)
@@ -48,8 +48,8 @@
SmallLine* line(size_t offset);
char* bytes() { return reinterpret_cast<char*>(this); }
- SmallLine* lines() { return m_lines.begin(); }
- SmallPage* pages() { return m_pages.begin(); }
+ SmallLine* lines() { return &m_lines[0]; }
+ SmallPage* pages() { return &m_pages[0]; }
private:
std::array<SmallLine, chunkSize / smallLineSize> m_lines;
Modified: releases/WebKitGTK/webkit-2.14/Source/bmalloc/bmalloc/FixedVector.h (207103 => 207104)
--- releases/WebKitGTK/webkit-2.14/Source/bmalloc/bmalloc/FixedVector.h 2016-10-11 12:32:47 UTC (rev 207103)
+++ releases/WebKitGTK/webkit-2.14/Source/bmalloc/bmalloc/FixedVector.h 2016-10-11 12:33:27 UTC (rev 207104)
@@ -44,7 +44,7 @@
FixedVector();
- const T* begin() const { return m_buffer.begin(); }
+ const T* begin() const { return &m_buffer[0]; }
const T* end() const { return begin() + size(); }
size_t size() const { return m_size; }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
