Modified: trunk/Tools/ChangeLog (229899 => 229900)
--- trunk/Tools/ChangeLog 2018-03-23 16:59:02 UTC (rev 229899)
+++ trunk/Tools/ChangeLog 2018-03-23 17:07:47 UTC (rev 229900)
@@ -1,3 +1,17 @@
+2018-03-23 JF Bastien <jfbast...@apple.com>
+
+ dump-class-layout is just wrong
+ https://bugs.webkit.org/show_bug.cgi?id=183939
+
+ Reviewed by Yusuke Suzuki.
+
+ Looks like r229291 contained a half-renamed variable in it, so it
+ just doesn't work.
+
+ * Scripts/dump-class-layout:
+ (verify_type):
+ (verify_type_recursive):
+
2018-03-23 Carlos Garcia Campos <cgar...@igalia.com>
Unreviewed. Run JSC GLib API tests in GTK+ and WPE bots.
Modified: trunk/Tools/Scripts/dump-class-layout (229899 => 229900)
--- trunk/Tools/Scripts/dump-class-layout 2018-03-23 16:59:02 UTC (rev 229899)
+++ trunk/Tools/Scripts/dump-class-layout 2018-03-23 17:07:47 UTC (rev 229900)
@@ -58,8 +58,8 @@
def verify_type(target, type):
typename = type.GetName()
- seenBefore = Set()
- (end_offset, padding) = verify_type_recursive(target, type, None, 0, 0, 0, seenBefore)
+ seenOffset = Set()
+ (end_offset, padding) = verify_type_recursive(target, type, None, 0, 0, 0, seenOffset)
byte_size = type.GetByteSize()
print 'Total byte size: %u' % (byte_size)
print 'Total pad bytes: %u' % (padding)
@@ -67,7 +67,7 @@
print 'Padding percentage: %2.2f %%' % ((float(padding) / float(byte_size)) * 100.0)
print
-def verify_type_recursive(target, type, member_name, depth, base_offset, padding, seenBefore):
+def verify_type_recursive(target, type, member_name, depth, base_offset, padding, seenOffset):
prev_end_offset = base_offset
typename = type.GetName()
byte_size = type.GetByteSize()
@@ -105,7 +105,7 @@
print '%+4u <%3u> %s<PADDING>' % (prev_end_offset, member_padding, ' ' * (depth + 1))
if member_is_class_or_struct:
- (prev_end_offset, padding) = verify_type_recursive(target, member_canonical_type, member_name, depth + 1, member_total_offset, padding, seenBefore)
+ (prev_end_offset, padding) = verify_type_recursive(target, member_canonical_type, member_name, depth + 1, member_total_offset, padding, seenOffset)
else:
prev_end_offset = member_total_offset + member_byte_size
member_typename = member_type.GetName()
