Attachment 348202 Details for Bug 189008 – ROLLOUT of r235376

[patch] ROLLOUT of r235376

bug-189008-20180827174723.patch (text/plain), 8.18 KB, created by WebKit Commit Bot on 2018-08-27 14:47:23 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: WebKit Commit Bot

Created: 2018-08-27 14:47:23 PDT

Size: 8.18 KB

patch

obsolete

>Subversion Revision: 235402
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 4d1a34a992eec660b87137f9c552f632c2a4f06a..c25ac4a2b1e7d76f63d44758331966af71aaab7c 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-08-27  Commit Queue  <commit-queue@webkit.org>
>+
>+        Unreviewed, rolling out r235376.
>+        https://bugs.webkit.org/show_bug.cgi?id=189008
>+
>+        Unit tests fail on Apple Sierra Debug and Apple High Sierra
>+        Debug bots. Will investigate offline. (Requested by dydz on
>+        #webkit).
>+
>+        Reverted changeset:
>+
>+        "lldb-webkit: Pretty-print OptionSet"
>+        https://bugs.webkit.org/show_bug.cgi?id=188936
>+        https://trac.webkit.org/changeset/235376
>+
> 2018-08-27  Justin Fan  <justin_fan@apple.com>
> 
>         Add Justin Fan to list of WebKit contributors
>diff --git a/Tools/lldb/lldbWebKitTester/main.cpp b/Tools/lldb/lldbWebKitTester/main.cpp
>index 9f8af5243d631e83fc80a20aa2a15c010bff0a6f..2ce8d6106e08ced9aa7aafa2db74680d728b82da 100644
>--- a/Tools/lldb/lldbWebKitTester/main.cpp
>+++ b/Tools/lldb/lldbWebKitTester/main.cpp
>@@ -27,7 +27,6 @@
> #include <stdio.h>
> #include <wtf/HashMap.h>
> #include <wtf/HashSet.h>
>-#include <wtf/OptionSet.h>
> #include <wtf/Vector.h>
> #include <wtf/text/StringBuilder.h>
> #include <wtf/text/WTFString.h>
>@@ -45,13 +44,6 @@ static String utf16String(const char16_t (&string)[length])
>     return builder.toString();
> }
> 
>-enum class ExampleFlags {
>-    A = 1 << 0,
>-    B = 1 << 1,
>-    C = 1 << 2,
>-    D = 1 << 3,
>-};
>-
> static void testSummaryProviders()
> {
>     String aNullString { "" };
>@@ -81,9 +73,6 @@ static void testSummaryProviders()
>     HashMap<unsigned, Vector<int>> hashMapOfVectors;
>     hashMapOfVectors.add(1, Vector<int>({2, 3}));
> 
>-    OptionSet<ExampleFlags> exampleFlagsEmpty;
>-    OptionSet<ExampleFlags> exampleFlagsSimple { ExampleFlags::A, ExampleFlags::D, ExampleFlags::C };
>-
>     breakForTestingSummaryProviders();
> }
> 
>diff --git a/Tools/lldb/lldb_webkit.py b/Tools/lldb/lldb_webkit.py
>index 83dced417c5f8aaf2ffc85328123469466b0e3a9..aabae4d97b3656079791b9a31c01020df95f49db 100644
>--- a/Tools/lldb/lldb_webkit.py
>+++ b/Tools/lldb/lldb_webkit.py
>@@ -1,4 +1,4 @@
>-# Copyright (C) 2012-2018 Apple Inc. All rights reserved.
>+# Copyright (C) 2012-2017 Apple Inc. All rights reserved.
> #
> # Redistribution and use in source and binary forms, with or without
> # modification, are permitted provided that the following conditions
>@@ -44,7 +44,6 @@ def __lldb_init_module(debugger, dict):
>     debugger.HandleCommand('type summary add --expand -F lldb_webkit.WTFHashMap_SummaryProvider -x "^WTF::HashMap<.+>$"')
>     debugger.HandleCommand('type summary add --expand -F lldb_webkit.WTFHashSet_SummaryProvider -x "^WTF::HashSet<.+>$"')
>     debugger.HandleCommand('type summary add --expand -F lldb_webkit.WTFMediaTime_SummaryProvider WTF::MediaTime')
>-    debugger.HandleCommand('type summary add --expand -F lldb_webkit.WTFOptionSet_SummaryProvider -x "^WTF::OptionSet<.+>$"')
> 
>     debugger.HandleCommand('type summary add -F lldb_webkit.WebCoreURL_SummaryProvider WebCore::URL')
>     debugger.HandleCommand('type summary add -F lldb_webkit.WebCoreColor_SummaryProvider WebCore::Color')
>@@ -65,7 +64,6 @@ def __lldb_init_module(debugger, dict):
>     # synthetic types (see <https://lldb.llvm.org/varformats.html>)
>     debugger.HandleCommand('type synthetic add -x "^WTF::Vector<.+>$" --python-class lldb_webkit.WTFVectorProvider')
>     debugger.HandleCommand('type synthetic add -x "^WTF::HashTable<.+>$" --python-class lldb_webkit.WTFHashTableProvider')
>-    debugger.HandleCommand('type synthetic add -x "^WTF::OptionSet<.+>$" --python-class lldb_webkit.WTFOptionSetProvider')
> 
> 
> def WTFString_SummaryProvider(valobj, dict):
>@@ -109,11 +107,6 @@ def WTFHashSet_SummaryProvider(valobj, dict):
>     return "{ tableSize = %d, keyCount = %d }" % (provider.tableSize(), provider.keyCount())
> 
> 
>-def WTFOptionSet_SummaryProvider(valobj, dict):
>-    provider = WTFOptionSetProvider(valobj, dict)
>-    return "{ size = %d }" % provider.size
>-
>-
> def WTFMediaTime_SummaryProvider(valobj, dict):
>     provider = WTFMediaTimeProvider(valobj, dict)
>     if provider.isInvalid():
>@@ -581,53 +574,6 @@ class WebCoreURLProvider:
>         return WTFStringProvider(self.valobj.GetChildMemberWithName('m_string'), dict).to_string()
> 
> 
>-class WTFOptionSetProvider:
>-    def __init__(self, valobj, internal_dict):
>-        self.valobj = valobj
>-        self.update()
>-
>-    def has_children(self):
>-        return bool(self._elements)
>-
>-    #  Metadata is stored at indices greater than or equal to the number of elements in the set.
>-    def num_children(self):
>-        return len(self._elements) + 1
>-
>-    def get_child_index(self, name):
>-        if name == 'm_storage':
>-            return self.num_children()
>-        try:
>-            return int(name.lstrip('[').rstrip(']'))
>-        except:
>-            return None
>-
>-    def get_child_at_index(self, index):
>-        if index < 0 or not self.valobj.IsValid():
>-            return None
>-        if index == self.num_children():
>-            return self.storage
>-        if index < len(self._elements):
>-            (name, value) = self._elements[index]
>-            return self.valobj.CreateValueFromExpression(name, str(value))
>-        return None
>-
>-    def update(self):
>-        self.storage = self.valobj.GetChildMemberWithName('m_storage')
>-
>-        template_argument_sbType = self.valobj.GetType().GetTemplateArgumentType(0)
>-        enumerator_value_to_name_map = {sbTypeEnumMember.GetValueAsUnsigned(): sbTypeEnumMember.GetName() for sbTypeEnumMember in template_argument_sbType.get_enum_members_array()}
>-
>-        # Iterate from least significant bit to most significant bit.
>-        elements = []
>-        bitmask = self.storage.GetValueAsUnsigned(0)
>-        while bitmask > 0:
>-            current = bitmask & -bitmask  # Isolate the rightmost set bit.
>-            elements.append((enumerator_value_to_name_map[current], current))  # e.g. ('Spelling', 4)
>-            bitmask = bitmask & (bitmask - 1)  # Turn off the rightmost set bit.
>-        self._elements = elements
>-        self.size = len(elements)
>-
>-
> class WTFVectorProvider:
>     def __init__(self, valobj, internal_dict):
>         self.valobj = valobj
>diff --git a/Tools/lldb/lldb_webkit_unittest.py b/Tools/lldb/lldb_webkit_unittest.py
>index 32eee249322a68c7750f8e4b938dc628b3c0b65d..865c97af57bf75026a4d77c2eb4515f0df1aa43a 100755
>--- a/Tools/lldb/lldb_webkit_unittest.py
>+++ b/Tools/lldb/lldb_webkit_unittest.py
>@@ -167,32 +167,3 @@ class TestSummaryProviders(unittest.TestCase):
>         variable = self._sbFrame.FindVariable('hashSetOfInts')
>         summary = lldb_webkit.WTFHashSet_SummaryProvider(variable, {})
>         self.assertEqual(summary, "{ tableSize = 8, keyCount = 1 }")
>-
>-    # MARK: WTFOptionSet_SummaryProvider test cases
>-
>-    def serial_test_WTFOptionSet_SummaryProvider_empty(self):
>-        variable = self._sbFrame.FindVariable('exampleFlagsEmpty')
>-        summary = lldb_webkit.WTFOptionSet_SummaryProvider(variable, {})
>-        self.assertEqual(summary, "{ size = 0 }")
>-
>-    def serial_test_WTFOptionSet_SummaryProvider_simple(self):
>-        variable = self._sbFrame.FindVariable('exampleFlagsSimple')
>-        summary = lldb_webkit.WTFOptionSet_SummaryProvider(variable, {})
>-        self.assertEqual(summary, "{ size = 3 }")
>-
>-    # MARK: WTFOptionSetProvider test cases
>-
>-    def serial_test_WTFOptionSetProvider_empty(self):
>-        variable = self._sbFrame.FindVariable('exampleFlagsEmpty')
>-        provider = lldb_webkit.WTFOptionSetProvider(variable, {})
>-        self.assertEqual(provider.get_child_at_index(0), None)
>-
>-    def serial_test_WTFOptionSetProvider_simple(self):
>-        variable = self._sbFrame.FindVariable('exampleFlagsSimple')
>-        provider = lldb_webkit.WTFOptionSetProvider(variable, {})
>-        self.assertEqual(provider.get_child_at_index(0).GetName(), 'A')
>-        self.assertEqual(provider.get_child_at_index(0).GetValue(), '1')
>-        self.assertEqual(provider.get_child_at_index(1).GetName(), 'C')
>-        self.assertEqual(provider.get_child_at_index(1).GetValue(), '4')
>-        self.assertEqual(provider.get_child_at_index(2).GetName(), 'D')
>-        self.assertEqual(provider.get_child_at_index(2).GetValue(), '8')

Flags:

dbates: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 189008: 348202