<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugs.webkit.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.4.1"
          urlbase="https://bugs.webkit.org/"
          
          maintainer="admin@webkit.org"
>

    <bug>
          <bug_id>226088</bug_id>
          
          <creation_ts>2021-05-21 09:39:52 -0700</creation_ts>
          <short_desc>[CMake] Cannot link libTestRunnerInjectedBundle.so in non unified build</short_desc>
          <delta_ts>2022-01-23 19:29:41 -0800</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>Tools / Tests</component>
          <version>WebKit Local Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          <see_also>https://bugs.webkit.org/show_bug.cgi?id=234191</see_also>
    
    <see_also>https://bugs.webkit.org/show_bug.cgi?id=225045</see_also>
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          <dependson>225990</dependson>
    
    <dependson>226322</dependson>
    
    <dependson>226401</dependson>
    
    <dependson>226471</dependson>
    
    <dependson>226763</dependson>
    
    <dependson>228579</dependson>
    
    <dependson>233493</dependson>
    
    <dependson>234106</dependson>
    
    <dependson>234392</dependson>
    
    <dependson>235013</dependson>
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Adrian Perez">aperez</reporter>
          <assigned_to name="Adrian Perez">aperez</assigned_to>
          <cc>annulen</cc>
    
    <cc>cdumez</cc>
    
    <cc>dino</cc>
    
    <cc>don.olmstead</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>fmalita</cc>
    
    <cc>gyuyoung.kim</cc>
    
    <cc>hi</cc>
    
    <cc>japhet</cc>
    
    <cc>joepeck</cc>
    
    <cc>joseph.j.griego</cc>
    
    <cc>keith_miller</cc>
    
    <cc>kondapallykalyan</cc>
    
    <cc>lmoura</cc>
    
    <cc>mark.lam</cc>
    
    <cc>msaboff</cc>
    
    <cc>pangle</cc>
    
    <cc>pdr</cc>
    
    <cc>ryuan.choi</cc>
    
    <cc>saam</cc>
    
    <cc>sabouhallawa</cc>
    
    <cc>schenney</cc>
    
    <cc>sergio</cc>
    
    <cc>tzagallo</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1762444</commentid>
    <comment_count>0</comment_count>
    <who name="Adrian Perez">aperez</who>
    <bug_when>2021-05-21 09:39:52 -0700</bug_when>
    <thetext>Build error (some things a bit formatted for legibility):

% CXX=clang++ CC=clang build-webkit --wpe --no-unified-builds
...
[1492/1547] Linking CXX shared library lib/libTestRunnerInjectedBundle.so                                                                                                                                                                      
FAILED: lib/libTestRunnerInjectedBundle.so                                                                                                                                                                                                     
: &amp;&amp; /usr/lib/sdk/llvm11/bin/clang++ -fPIC -fdiagnostics-color=always -fcolor-diagnostics -Wextra -Wall -Wno-noexcept-type -Wno-psabi 
   -Wno-misleading-indentation -Wno-parentheses-equality -Qunused-arguments -Wwrite-strings -Wundef -Wpointer-arith 
   -Wmissing-format-attribute -Wformat-security -Wcast-align -Wno-tautological-compare  -fno-strict-aliasing -fno-exceptions
   -fno-rtti -O3 -DNDEBUG  -Wl,--no-undefined  -fuse-ld=gold -Wl,--disable-new-dtags -shared -Wl,-soname,libTestRunnerInjectedBundle.so 
   -o lib/libTestRunnerInjectedBundle.so 
   Tools/WebKitTestRunner/CMakeFiles/TestRunnerInjectedBundle.dir/InjectedBundle/AccessibilityController.cpp.o
   Tools/WebKitTestRunner/CMakeFiles/TestRunnerInjectedBundle.dir/InjectedBundle/AccessibilityTextMarker.cpp.o
   Tools/WebKitTestRunner/CMakeFiles/TestRunnerInjectedBundle.dir/InjectedBundle/AccessibilityTextMarkerRange.cpp.o
   Tools/WebKitTestRunner/CMakeFiles/TestRunnerInjectedBundle.dir/InjectedBundle/AccessibilityUIElement.cpp.o
   Tools/WebKitTestRunner/CMakeFiles/TestRunnerInjectedBundle.dir/InjectedBundle/EventSendingController.cpp.o
   Tools/WebKitTestRunner/CMakeFiles/TestRunnerInjectedBundle.dir/InjectedBundle/GCController.cpp.o
   Tools/WebKitTestRunner/CMakeFiles/TestRunnerInjectedBundle.dir/InjectedBundle/InjectedBundle.cpp.o
   Tools/WebKitTestRunner/CMakeFiles/TestRunnerInjectedBundle.dir/InjectedBundle/InjectedBundleMain.cpp.o
   Tools/WebKitTestRunner/CMakeFiles/TestRunnerInjectedBundle.dir/InjectedBundle/InjectedBundlePage.cpp.o
   Tools/WebKitTestRunner/CMakeFiles/TestRunnerInjectedBundle.dir/InjectedBundle/TestRunner.cpp.o
   Tools/WebKitTestRunner/CMakeFiles/TestRunnerInjectedBundle.dir/InjectedBundle/TextInputController.cpp.o
   Tools/WebKitTestRunner/CMakeFiles/TestRunnerInjectedBundle.dir/__/__/WebKitTestRunner/DerivedSources/InjectedBundle/JSAccessibilityController.cpp.o
   Tools/WebKitTestRunner/CMakeFiles/TestRunnerInjectedBundle.dir/__/__/WebKitTestRunner/DerivedSources/InjectedBundle/JSAccessibilityTextMarker.cpp.o
   Tools/WebKitTestRunner/CMakeFiles/TestRunnerInjectedBundle.dir/__/__/WebKitTestRunner/DerivedSources/InjectedBundle/JSAccessibilityTextMarkerRange.cpp.o
   Tools/WebKitTestRunner/CMakeFiles/TestRunnerInjectedBundle.dir/__/__/WebKitTestRunner/DerivedSources/InjectedBundle/JSAccessibilityUIElement.cpp.o
   Tools/WebKitTestRunner/CMakeFiles/TestRunnerInjectedBundle.dir/__/__/WebKitTestRunner/DerivedSources/InjectedBundle/JSEventSendingController.cpp.o
   Tools/WebKitTestRunner/CMakeFiles/TestRunnerInjectedBundle.dir/__/__/WebKitTestRunner/DerivedSources/InjectedBundle/JSGCController.cpp.o
   Tools/WebKitTestRunner/CMakeFiles/TestRunnerInjectedBundle.dir/__/__/WebKitTestRunner/DerivedSources/InjectedBundle/JSTestRunner.cpp.o
   Tools/WebKitTestRunner/CMakeFiles/TestRunnerInjectedBundle.dir/__/__/WebKitTestRunner/DerivedSources/InjectedBundle/JSTextInputController.cpp.o
   Tools/WebKitTestRunner/CMakeFiles/TestRunnerInjectedBundle.dir/InjectedBundle/atk/AccessibilityControllerAtk.cpp.o
   Tools/WebKitTestRunner/CMakeFiles/TestRunnerInjectedBundle.dir/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.cpp.o
   Tools/WebKitTestRunner/CMakeFiles/TestRunnerInjectedBundle.dir/InjectedBundle/atk/AccessibilityUIElementAtk.cpp.o
   Tools/WebKitTestRunner/CMakeFiles/TestRunnerInjectedBundle.dir/InjectedBundle/wpe/ActivateFontsWPE.cpp.o
   Tools/WebKitTestRunner/CMakeFiles/TestRunnerInjectedBundle.dir/InjectedBundle/wpe/InjectedBundleWPE.cpp.o
   Tools/WebKitTestRunner/CMakeFiles/TestRunnerInjectedBundle.dir/InjectedBundle/wpe/TestRunnerWPE.cpp.o
   -Wl,-rpath,/app/webkit/WebKitBuild/Release/lib  lib/libTestRunnerShared.a
   /usr/lib/x86_64-linux-gnu/libatk-1.0.so  /usr/lib/x86_64-linux-gnu/libglib-2.0.so  /usr/lib/x86_64-linux-gnu/libcairo.so
   lib/libWebCoreTestSupport.a  lib/libPAL.a  lib/libJavaScriptCore.a  lib/libWTF.a  lib/libbmalloc.a 
   lib/libWPEWebKit-1.1.so.0.0.0  /usr/lib/x86_64-linux-gnu/libcairo.so  /usr/lib/x86_64-linux-gnu/libatk-bridge-2.0.so
   /usr/lib/x86_64-linux-gnu/libicudata.so  /usr/lib/x86_64-linux-gnu/libicui18n.so  /usr/lib/x86_64-linux-gnu/libicuuc.so
   -lpthread  /usr/lib/x86_64-linux-gnu/libsystemd.so  /usr/lib/x86_64-linux-gnu/libxml2.so  /usr/lib/x86_64-linux-gnu/libsqlite3.so
   /usr/lib/x86_64-linux-gnu/libxslt.so  /usr/lib/x86_64-linux-gnu/libepoxy.so  lib/libANGLE.a  -ldl
   /usr/lib/x86_64-linux-gnu/libwoff2dec.so  lib/libxdgmime.a  lib/libwebrtc.a  /usr/lib/x86_64-linux-gnu/libvpx.so
   /usr/lib/x86_64-linux-gnu/libevent.so  /usr/lib/x86_64-linux-gnu/libopus.so  /usr/lib/x86_64-linux-gnu/libopenh264.so
   /usr/lib/x86_64-linux-gnu/libfontconfig.so  /usr/lib/x86_64-linux-gnu/libfreetype.so  /usr/lib/x86_64-linux-gnu/libharfbuzz.so
   /usr/lib/x86_64-linux-gnu/libharfbuzz-icu.so  /usr/lib/x86_64-linux-gnu/libgcrypt.so  /usr/lib/x86_64-linux-gnu/libgstapp-1.0.so
   /usr/lib/x86_64-linux-gnu/libgstbase-1.0.so  /usr/lib/x86_64-linux-gnu/libgstpbutils-1.0.so  /usr/lib/x86_64-linux-gnu/libgstaudio-1.0.so
   /usr/lib/x86_64-linux-gnu/libgsttag-1.0.so  /usr/lib/x86_64-linux-gnu/libgstvideo-1.0.so  /usr/lib/x86_64-linux-gnu/libgstgl-1.0.so
   /usr/lib/x86_64-linux-gnu/libgstcodecparsers-1.0.so  /usr/lib/x86_64-linux-gnu/libgstfft-1.0.so  /usr/lib/x86_64-linux-gnu/libgcrypt.so
   /usr/lib/x86_64-linux-gnu/libgstapp-1.0.so  /usr/lib/x86_64-linux-gnu/libgstbase-1.0.so  /usr/lib/x86_64-linux-gnu/libgstpbutils-1.0.so
   /usr/lib/x86_64-linux-gnu/libgstaudio-1.0.so  /usr/lib/x86_64-linux-gnu/libgsttag-1.0.so  /usr/lib/x86_64-linux-gnu/libgstvideo-1.0.so
   /usr/lib/x86_64-linux-gnu/libgstgl-1.0.so  /usr/lib/x86_64-linux-gnu/libgstcodecparsers-1.0.so  /usr/lib/x86_64-linux-gnu/libgstfft-1.0.so
   /usr/lib/x86_64-linux-gnu/libgstreamer-1.0.so  -lgpg-error  /usr/lib/x86_64-linux-gnu/libatk-1.0.so  /usr/lib/x86_64-linux-gnu/libgmodule-2.0.so
   /usr/lib/x86_64-linux-gnu/libgio-2.0.so  /usr/lib/x86_64-linux-gnu/libgobject-2.0.so  /usr/lib/x86_64-linux-gnu/libglib-2.0.so
   /usr/lib/x86_64-linux-gnu/libjpeg.so  /usr/lib/x86_64-linux-gnu/libpng.so  /usr/lib/x86_64-linux-gnu/libz.so
   /usr/lib/x86_64-linux-gnu/libopenjp2.so  /usr/lib/x86_64-linux-gnu/libwebpdemux.so  /usr/lib/x86_64-linux-gnu/libwebp.so
   /usr/lib/x86_64-linux-gnu/libavif.so  /usr/lib/x86_64-linux-gnu/libsoup-3.0.so  /usr/lib/x86_64-linux-gnu/libwpe-1.0.so
   /usr/lib/x86_64-linux-gnu/libtasn1.so  /usr/lib/x86_64-linux-gnu/liblcms2.so  /usr/lib/x86_64-linux-gnu/libWPEBackend-fdo-1.0.so
   /usr/lib/x86_64-linux-gnu/libopenxr_loader.so &amp;&amp; : 

lib/libWebCoreTestSupport.a(lib/../Source/WebCore/CMakeFiles/WebCoreTestSupport.dir/testing/Internals.cpp.o):Internals.cpp:
  function WebCore::InspectorStubFrontend::InspectorStubFrontend(WebCore::Page&amp;, WTF::RefPtr&lt;WebCore::DOMWindow, WTF::RawPtrTraits&lt;WebCore::DOMWindow&gt;, WTF::DefaultRefDerefTraits&lt;WebCore::DOMWindow&gt; &gt;&amp;&amp;):
    error: undefined reference to &apos;vtable for WebCore::InspectorFrontendClientLocal::Settings&apos;
/usr/lib/gcc/x86_64-unknown-linux-gnu/10.2.0/../../../../x86_64-unknown-linux-gnu/bin/ld.gold: the vtable symbol may be undefined because the class is missing its key function

lib/libWebCoreTestSupport.a(lib/../Source/WebCore/CMakeFiles/WebCoreTestSupport.dir/testing/Internals.cpp.o):Internals.cpp:
  function WebCore::InspectorStubFrontend::InspectorStubFrontend(WebCore::Page&amp;, WTF::RefPtr&lt;WebCore::DOMWindow, WTF::RawPtrTraits&lt;WebCore::DOMWindow&gt;, WTF::DefaultRefDerefTraits&lt;WebCore::DOMWindow&gt; &gt;&amp;&amp;):
    error: undefined reference to &apos;WebCore::InspectorFrontendClientLocal::InspectorFrontendClientLocal(WebCore::InspectorController*, WebCore::Page*, std::unique_ptr&lt;WebCore::InspectorFrontendClientLocal::Settings, std::default_delete&lt;WebCore::InspectorFrontendClientLocal::Settings&gt; &gt;)&apos;

lib/libWebCoreTestSupport.a(lib/../Source/WebCore/CMakeFiles/WebCoreTestSupport.dir/testing/Internals.cpp.o):Internals.cpp:
  function WebCore::InspectorStubFrontend::~InspectorStubFrontend():
    error: undefined reference to &apos;WebCore::Inspector FrontendClientLocal::inspectedPage() const&apos;

lib/libWebCoreTestSupport.a(lib/../Source/WebCore/CMakeFiles/WebCoreTestSupport.dir/testing/Internals.cpp.o):Internals.cpp:
  function WebCore::InspectorStubFrontend::~InspectorStubFrontend():
    error: undefined reference to &apos;WebCore::InspectorFrontendClientLocal::~InspectorFrontendClientLocal()&apos;

lib/libWebCoreTestSupport.a(lib/../Source/WebCore/CMakeFiles/WebCoreTestSupport.dir/testing/Internals.cpp.o):Internals.cpp:
  function WebCore::InspectorStubFrontend::closeWindow():
     error: undefined reference to &apos;WebCore::InspectorFrontendClientLocal::inspectedPage() const&apos;

lib/libWebCoreTestSupport.a(lib/../Source/WebCore/CMakeFiles/WebCoreTestSupport.dir/testing/Internals.cpp.o):Internals.cpp:
  function WebCore::createRecorderMockSource(WebCore::MediaStreamPrivate&amp;, WebCore::MediaRecorderPrivateOptions const&amp;):
    error: undefined reference to &apos;WebCore::MediaRecorderPrivateMock::MediaRecorderPrivateMock(WebCore::MediaStreamPrivate&amp;)&apos;

lib/libWebCoreTestSupport.a(lib/../Source/WebCore/CMakeFiles/WebCoreTestSupport.dir/testing/Internals.cpp.o):Internals.cpp:
  function WebCore::Internals::initializeMockMediaSource():
    error: undefined reference to &apos;WebCore::MockMediaPlayerMediaSource::registerMediaEngine(void (*)(std::unique_ptr&lt;WebCore::MediaPlayerFactory, std::default_delete&lt;WebCore::MediaPlayerFactory&gt; &gt;&amp;&amp;))&apos;

lib/libWebCoreTestSupport.a(lib/../Source/WebCore/CMakeFiles/WebCoreTestSupport.dir/testing/Internals.cpp.o):Internals.cpp:
  function WebCore::Internals::setPlatformMomentumScrollingPredictionEnabled(bool):
    error: undefined reference to &apos;WebCore::ScrollingMomentumCalculator::setPlatformMomentumScrollingPredictionEnabled(bool)&apos;

lib/libWebCoreTestSupport.a(lib/../Source/WebCore/CMakeFiles/WebCoreTestSupport.dir/testing/Internals.cpp.o):Internals.cpp:
  function WebCore::Internals::parseHEVCCodecParameters(WTF::StringView):
     error: undefined reference to &apos;WebCore::parseHEVCCodecParameters(WTF::StringView)&apos;

lib/libWebCoreTestSupport.a(lib/../Source/WebCore/CMakeFiles/WebCoreTestSupport.dir/testing/Internals.cpp.o):Internals.cpp:
  function WebCore::Internals::parseDoViCodecParameters(WTF::StringView):
    error: undefined reference to &apos;WebCore::parseDoViCodecParameters(WTF::StringView)&apos;

lib/libWebCoreTestSupport.a(lib/../Source/WebCore/CMakeFiles/WebCoreTestSupport.dir/testing/Internals.cpp.o):Internals.cpp:
  function WebCore::Internals::parseVPCodecParameters(WTF::StringView):
    error: undefined reference to &apos;WebCore::parseVPCodecParameters(WTF::StringView)&apos;

lib/libWebCoreTestSupport.a(lib/../Source/WebCore/CMakeFiles/WebCoreTestSupport.dir/testing/Internals.cpp.o):Internals.cpp:
  function WebCore::Internals::rangeContainsNode(WebCore::AbstractRange const&amp;, WebCore::Node&amp;, WebCore::Internals::TreeType):
    error: undefined reference to &apos;WebCore::makeSimpleRange(WebCore::AbstractRange const&amp;)&apos;

lib/libWebCoreTestSupport.a(lib/../Source/WebCore/CMakeFiles/WebCoreTestSupport.dir/testing/Internals.cpp.o):Internals.cpp:
  function WebCore::Internals::rangeContainsBoundaryPoint(WebCore::AbstractRange const&amp;, WebCore::Node&amp;, unsigned int, WebCore::Internals::TreeType):
    error: undefined reference to &apos;WebCore::makeSimpleRange(WebCore::AbstractRange const&amp;)&apos;

lib/libWebCoreTestSupport.a(lib/../Source/WebCore/CMakeFiles/WebCoreTestSupport.dir/testing/Internals.cpp.o):Internals.cpp:
  function WebCore::Internals::rangeContainsRange(WebCore::AbstractRange const&amp;, WebCore::AbstractRange const&amp;, WebCore::Internals::TreeType): error: undefined reference to &apos;WebCore::makeSimpleRange(WebCore::AbstractRange const&amp;)&apos;

lib/libWebCoreTestSupport.a(lib/../Source/WebCore/CMakeFiles/WebCoreTestSupport.dir/testing/Internals.cpp.o):Internals.cpp:
  function WebCore::Internals::rangeContainsRange(WebCore::AbstractRange const&amp;, WebCore::AbstractRange const&amp;, WebCore::Internals::TreeType):
    error: undefined reference to &apos;WebCore::makeSimpleRange(WebCore::AbstractRange const&amp;)&apos;

lib/libWebCoreTestSupport.a(lib/../Source/WebCore/CMakeFiles/WebCoreTestSupport.dir/testing/Internals.cpp.o):Internals.cpp:
  vtable for WebCore::InspectorStubFrontend:
    error: undefined reference to &apos;WebCore::InspectorFrontendClientLocal::windowObjectCleared()&apos;

lib/libWebCoreTestSupport.a(lib/../Source/WebCore/CMakeFiles/WebCoreTestSupport.dir/testing/Internals.cpp.o):Internals.cpp:
  vtable for WebCore::InspectorStubFrontend:
    error: undefined reference to &apos;WebCore::InspectorFrontendClientLocal::frontendLoaded()&apos;

lib/libWebCoreTestSupport.a(lib/../Source/WebCore/CMakeFiles/WebCoreTestSupport.dir/testing/Internals.cpp.o):Internals.cpp:
  vtable for WebCore::InspectorStubFrontend:
    error: undefined reference to &apos;WebCore::InspectorFrontendClientLocal::pagePaused()&apos;

lib/libWebCoreTestSupport.a(lib/../Source/WebCore/CMakeFiles/WebCoreTestSupport.dir/testing/Internals.cpp.o):Internals.cpp:
  vtable for WebCore::InspectorStubFrontend:
    error: undefined reference to &apos;WebCore::InspectorFrontendClientLocal::pageUnpaused()&apos;

lib/libWebCoreTestSupport.a(lib/../Source/WebCore/CMakeFiles/WebCoreTestSupport.dir/testing/Internals.cpp.o):Internals.cpp:
  vtable for WebCore::InspectorStubFrontend:
    error: undefined reference to &apos;WebCore::InspectorFrontendClientLocal::moveWindowBy(float, float)&apos;

lib/libWebCoreTestSupport.a(lib/../Source/WebCore/CMakeFiles/WebCoreTestSupport.dir/testing/Internals.cpp.o):Internals.cpp:
  vtable for WebCore::InspectorStubFrontend:
    error: undefined reference to &apos;WebCore::InspectorFrontendClientLocal::inspectionLevel() const&apos;

lib/libWebCoreTestSupport.a(lib/../Source/WebCore/CMakeFiles/WebCoreTestSupport.dir/testing/Internals.cpp.o):Internals.cpp:
  vtable for WebCore::InspectorStubFrontend:
    error: undefined reference to &apos;WebCore::InspectorFrontendClientLocal::resetState()&apos;

lib/libWebCoreTestSupport.a(lib/../Source/WebCore/CMakeFiles/WebCoreTestSupport.dir/testing/Internals.cpp.o):Internals.cpp:
  vtable for WebCore::InspectorStubFrontend:
    error: undefined reference to &apos;WebCore::InspectorFrontendClientLocal::userInterfaceLayoutDirection() const&apos;

lib/libWebCoreTestSupport.a(lib/../Source/WebCore/CMakeFiles/WebCoreTestSupport.dir/testing/Internals.cpp.o):Internals.cpp:
  vtable for WebCore::InspectorStubFrontend:
    error: undefined reference to WebCore::InspectorFrontendClientLocal::requestSetDockSide(WebCore::InspectorFrontendClient::DockSide)&apos;

lib/libWebCoreTestSupport.a(lib/../Source/WebCore/CMakeFiles/WebCoreTestSupport.dir/testing/Internals.cpp.o):Internals.cpp:
  vtable for WebCore::InspectorStubFrontend:
    error: undefined reference to &apos;WebCore::InspectorFrontendClientLocal::changeAttachedWindowHeight(unsigned int)&apos;

lib/libWebCoreTestSupport.a(lib/../Source/WebCore/CMakeFiles/WebCoreTestSupport.dir/testing/Internals.cpp.o):Internals.cpp:
  vtable for WebCore::InspectorStubFrontend:
    error: undefined reference to &apos;WebCore::InspectorFrontendClientLocal::changeAttachedWindowWidth(unsigned int)&apos;

lib/libWebCoreTestSupport.a(lib/../Source/WebCore/CMakeFiles/WebCoreTestSupport.dir/testing/Internals.cpp.o):Internals.cpp:
  vtable for WebCore::InspectorStubFrontend:
    error: undefined reference to &apos;WebCore::InspectorFrontendClientLocal::changeSheetRect(WebCore::FloatRect const&amp;)&apos;

lib/libWebCoreTestSupport.a(lib/../Source/WebCore/CMakeFiles/WebCoreTestSupport.dir/testing/Internals.cpp.o):Internals.cpp:
  vtable for WebCore::InspectorStubFrontend:
    error: undefined reference to &apos;WebCore::InspectorFrontendClientLocal::openURLExternally(WTF::String const&amp;)&apos;

lib/libWebCoreTestSupport.a(lib/../Source/WebCore/CMakeFiles/WebCoreTestSupport.dir/testing/Internals.cpp.o):Internals.cpp:
  vtable for WebCore::InspectorStubFrontend:
    error: undefined reference to &apos;WebCore::InspectorFrontendClientLocal::sendMessageToBackend(WTF::String const&amp;)&apos;

lib/libWebCoreTestSupport.a(lib/../Source/WebCore/CMakeFiles/WebCoreTestSupport.dir/testing/Internals.cpp.o):Internals.cpp:
  vtable for WebCore::InspectorStubFrontend: error: undefined reference to &apos;WebCore::InspectorFrontendClientLocal::isUnderTest()&apos;

clang-11: error: linker command failed with exit code 1 (use -v to see invocation)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1762812</commentid>
    <comment_count>1</comment_count>
      <attachid>429411</attachid>
    <who name="Adrian Perez">aperez</who>
    <bug_when>2021-05-22 08:26:29 -0700</bug_when>
    <thetext>Created attachment 429411
WIP Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1762828</commentid>
    <comment_count>2</comment_count>
    <who name="Adrian Perez">aperez</who>
    <bug_when>2021-05-22 11:13:09 -0700</bug_when>
    <thetext>(In reply to Adrian Perez from comment #1)
&gt; Created attachment 429411 [details]
&gt; WIP Patch

This patch solves the underlinking issue but then it runs in a multiple
definition issue:

/usr/lib/gcc/x86_64-unknown-linux-gnu/10.2.0/../../../../x86_64-unknown-linux-gnu/bin/ld.gold: error:   
  lib/libWebCore.a(lib/../Source/WebCore/CMakeFiles/WebCore.dir/platform/audio/PlatformMediaSession.cpp.o):
    multiple definition of &apos;WebCore::convertEnumerationToString(WebCore::PlatformMediaSession::State)&apos;
/usr/lib/gcc/x86_64-unknown-linux-gnu/10.2.0/../../../../x86_64-unknown-linux-gnu/bin/ld.gold:
  lib/libWebCoreTestSupport.a(lib/../Source/WebCore/CMakeFiles/WebCoreTestSupport.dir/__/__/WebCore/DerivedSources/JSInternals.cpp.o):
    previous definition here</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1823166</commentid>
    <comment_count>3</comment_count>
    <who name="Lauro Moura">lmoura</who>
    <bug_when>2021-12-10 21:44:35 -0800</bug_when>
    <thetext>(In reply to Adrian Perez from comment #2)
&gt; (In reply to Adrian Perez from comment #1)
&gt; &gt; Created attachment 429411 [details]
&gt; &gt; WIP Patch
&gt; 
&gt; This patch solves the underlinking issue but then it runs in a multiple
&gt; definition issue:
&gt; 
&gt; /usr/lib/gcc/x86_64-unknown-linux-gnu/10.2.0/../../../../x86_64-unknown-
&gt; linux-gnu/bin/ld.gold: error:   
&gt;  
&gt; lib/libWebCore.a(lib/../Source/WebCore/CMakeFiles/WebCore.dir/platform/audio/
&gt; PlatformMediaSession.cpp.o):
&gt;     multiple definition of
&gt; &apos;WebCore::convertEnumerationToString(WebCore::PlatformMediaSession::State)&apos;
&gt; /usr/lib/gcc/x86_64-unknown-linux-gnu/10.2.0/../../../../x86_64-unknown-
&gt; linux-gnu/bin/ld.gold:
&gt;  
&gt; lib/libWebCoreTestSupport.a(lib/../Source/WebCore/CMakeFiles/
&gt; WebCoreTestSupport.dir/__/__/WebCore/DerivedSources/JSInternals.cpp.o):
&gt;     previous definition here

I&apos;ve got this with GTK too.

This seems to be caused by a collision between convertEnumerationToString for Internals::MediaSessionState (generated) and for PlatformMediaSession::State (manual). The internals enum is an alias to the Platform one.

Searching through the Internals idl, this is the only case of a enum declared in the IDL that&apos;s both an alias to an &quot;external&quot; enum AND defines a manual convertEnumerationToString.

These two enums seems to be quite old (pre-2018), didn&apos;t a few months ago GTK used to build non-unified to the end?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1823898</commentid>
    <comment_count>4</comment_count>
      <attachid>447105</attachid>
    <who name="Lauro Moura">lmoura</who>
    <bug_when>2021-12-13 20:43:14 -0800</bug_when>
    <thetext>Created attachment 447105
Tentative patch

Patch based on Adrian&apos;s, building unified/non-unified on top of r286914 (Last sunday). It replaces the alias for the MediaSession enum in the Internals.h with separate enum with the same values. Not sure if it&apos;s the best approach, though.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1823967</commentid>
    <comment_count>5</comment_count>
      <attachid>447125</attachid>
    <who name="Lauro Moura">lmoura</who>
    <bug_when>2021-12-14 05:10:50 -0800</bug_when>
    <thetext>Created attachment 447125
Rebased patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1823968</commentid>
    <comment_count>6</comment_count>
      <attachid>447125</attachid>
    <who name="Adrian Perez">aperez</who>
    <bug_when>2021-12-14 05:18:24 -0800</bug_when>
    <thetext>Comment on attachment 447125
Rebased patch

LGTM with a nit to change before landing -- and thanks to looking into this,
I hadn&apos;t had the time to bring myself to fix it yet 💪️

View in context: https://bugs.webkit.org/attachment.cgi?id=447125&amp;action=review

&gt; Source/WebCore/testing/Internals.h:1006
&gt; +    // directly with libWebCore (e.g. with non-unified builds)

I think we don&apos;t want to mention here anything about unified vs. non-unified
builds, because with an unlucky combination of unified sources the issue could
come up anyway. The rest of the comment is good to have it here for clarity,
as this may not be obvious to the people reading the code =)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1824540</commentid>
    <comment_count>7</comment_count>
    <who name="Lauro Moura">lmoura</who>
    <bug_when>2021-12-15 14:03:03 -0800</bug_when>
    <thetext>The WinCairo EWS failure is mostly composed of errors like these:

```
JSInternals.cpp.obj : error LNK2001: unresolved external symbol &quot;protected: static struct JSC::ClassInfo const WebCore::JSFile::s_info&quot; (?s_info@JSFile@WebCore@@1UClassInfo@JSC@@B)
```

Where `s_info` is defined in the derived source `JSFile.cpp`:

```
template&lt;&gt; const ClassInfo JSFileDOMConstructor::s_info = { &quot;File&quot;, &amp;Base::s_info, nullptr, nullptr, CREATE_METHOD_TABLE(JSFileDOMConstructor) };
```

Could find out why this is happening yet (Tried building on Windows locally but it failed before this step).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1831932</commentid>
    <comment_count>8</comment_count>
      <attachid>449457</attachid>
    <who name="Lauro Moura">lmoura</who>
    <bug_when>2022-01-18 20:09:17 -0800</bug_when>
    <thetext>Created attachment 449457
Rebased patch with new nonunified fixes</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1832564</commentid>
    <comment_count>9</comment_count>
    <who name="Joseph Griego">joseph.j.griego</who>
    <bug_when>2022-01-20 13:56:57 -0800</bug_when>
    <thetext>*** Bug 235416 has been marked as a duplicate of this bug. ***</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1832620</commentid>
    <comment_count>10</comment_count>
      <attachid>449623</attachid>
    <who name="Lauro Moura">lmoura</who>
    <bug_when>2022-01-20 16:36:14 -0800</bug_when>
    <thetext>Created attachment 449623
Updated patch with different cmake approach

Instead of pulling WebCore as WebCoreTestSupport dependency directly, make WTR/WTRInjected bundle pull it instead. As the CMake-related code changed, cleared the Reviewed-By field (will wait for green bubbles before rq&apos;ing it).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1832727</commentid>
    <comment_count>11</comment_count>
      <attachid>449623</attachid>
    <who name="Adrian Perez">aperez</who>
    <bug_when>2022-01-21 03:11:52 -0800</bug_when>
    <thetext>Comment on attachment 449623
Updated patch with different cmake approach

Wooohoo! I&apos;m stoked to see this issue being axed, good one Lauro!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1832735</commentid>
    <comment_count>12</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2022-01-21 05:12:41 -0800</bug_when>
    <thetext>Committed r288361 (246265@main): &lt;https://commits.webkit.org/246265@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 449623.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1832736</commentid>
    <comment_count>13</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2022-01-21 05:13:21 -0800</bug_when>
    <thetext>&lt;rdar://problem/87879972&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>429411</attachid>
            <date>2021-05-22 08:26:29 -0700</date>
            <delta_ts>2021-12-13 20:43:09 -0800</delta_ts>
            <desc>WIP Patch</desc>
            <filename>bug-226088-20210522182628.patch</filename>
            <type>text/plain</type>
            <size>1921</size>
            <attacher name="Adrian Perez">aperez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3ODY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
TWFrZUxpc3RzLnR4dCBiL1NvdXJjZS9XZWJDb3JlL0NNYWtlTGlzdHMudHh0CmluZGV4IGNhMjRi
NTBiOTgyMjEyZjY1ZTdiMzlmZjczZmM0MmM3YmFmNjU1MzYuLmVhZDljYmI1YWQ1ZDE0MDYyOTFj
YzgwMjU2ZWYzY2MxOGViZGY2ZWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NNYWtlTGlz
dHMudHh0CisrKyBiL1NvdXJjZS9XZWJDb3JlL0NNYWtlTGlzdHMudHh0CkBAIC0xNTAxLDcgKzE1
MDEsNyBAQCBlbHNlICgpCiAgICAgZW5kaWYgKCkKIGVuZGlmICgpCiAKLXNldChXZWJDb3JlVGVz
dFN1cHBvcnRfRlJBTUVXT1JLUyAke1dlYkNvcmVfRlJBTUVXT1JLU30pCitzZXQoV2ViQ29yZVRl
c3RTdXBwb3J0X0ZSQU1FV09SS1MgV2ViQ29yZSkKIHNldChXZWJDb3JlVGVzdFN1cHBvcnRfREVQ
RU5ERU5DSUVTIFdlYkNvcmVUZXN0U3VwcG9ydEJpbmRpbmdzKQogCiBpZiAoRU5BQkxFX0xFR0FD
WV9FTkNSWVBURURfTUVESUEpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv
SW5zcGVjdG9yQ29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj
dG9yQ29udHJvbGxlci5jcHAKaW5kZXggYzMzYmM5ODlkOTVhMjE0MjVkNDM2NDM3OTUxOTBjZjQw
ZjdlOTY4NC4uZGYxZjllNjk0NzZjYWQzZDVhYWEzZWQ4NjVmM2VlYTFiZjI0YmI4NCAxMDA2NDQK
LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCisr
KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcApAQCAt
MzU5LDYgKzM1OSwxMSBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmdldEhpZ2hsaWdodChJ
bnNwZWN0b3JPdmVybGF5OjpIaWdobGlnaHQmIGhpZ2hsaWdodCwgSQogICAgIG1fb3ZlcmxheS0+
Z2V0SGlnaGxpZ2h0KGhpZ2hsaWdodCwgY29vcmRpbmF0ZVN5c3RlbSk7CiB9CiAKK2Jvb2wgSW5z
cGVjdG9yQ29udHJvbGxlcjo6aXNVbmRlclRlc3QoKSBjb25zdAoreworICAgIHJldHVybiBtX2lz
VW5kZXJUZXN0OworfQorCiB1bnNpZ25lZCBJbnNwZWN0b3JDb250cm9sbGVyOjpncmlkT3Zlcmxh
eUNvdW50KCkgY29uc3QKIHsKICAgICByZXR1cm4gbV9vdmVybGF5LT5ncmlkT3ZlcmxheUNvdW50
KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJv
bGxlci5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuaApp
bmRleCA3ODRiZjQ4MmZkNjhkYTY4ZTFmMzhmZDVjZDZiY2VkYzg5NzFkZmRhLi5hNTY5MTFlNTEz
OTMwZWJmMzYyOTZmNjJjOGY1OGM4YjlhZWNiMjQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y
ZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu
c3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmgKQEAgLTEwMiw3ICsxMDIsNyBAQCBwdWJsaWM6
CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBkaWRDb21wb3NpdGUoRnJhbWUmKTsKIAogICAgIC8v
IFRlc3Rpbmcgc3VwcG9ydC4KLSAgICBib29sIGlzVW5kZXJUZXN0KCkgY29uc3QgeyByZXR1cm4g
bV9pc1VuZGVyVGVzdDsgfQorICAgIFdFQkNPUkVfRVhQT1JUIGJvb2wgaXNVbmRlclRlc3QoKSBj
b25zdDsKICAgICB2b2lkIHNldElzVW5kZXJUZXN0KGJvb2wgaXNVbmRlclRlc3QpIHsgbV9pc1Vu
ZGVyVGVzdCA9IGlzVW5kZXJUZXN0OyB9CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBldmFsdWF0
ZUZvclRlc3RJbkZyb250ZW5kKGNvbnN0IFN0cmluZyYgc2NyaXB0KTsKICAgICBXRUJDT1JFX0VY
UE9SVCB1bnNpZ25lZCBncmlkT3ZlcmxheUNvdW50KCkgY29uc3Q7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>447105</attachid>
            <date>2021-12-13 20:43:14 -0800</date>
            <delta_ts>2021-12-14 05:10:45 -0800</delta_ts>
            <desc>Tentative patch</desc>
            <filename>bug-226088-20211214014313.patch</filename>
            <type>text/plain</type>
            <size>5779</size>
            <attacher name="Lauro Moura">lmoura</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2OTE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWEyZWFlNjMwMWQzYTE1
NjEwMDM5MzVlMDY3YjJhNWVkM2IyN2YwNi4uOWE3MzA0ZTZkODhjOWVhYjFiZWIzZTFjOTg2ZmYx
OTJmNzAwNTE5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIxLTEyLTEzICBMYXVy
byBNb3VyYSAgPGxtb3VyYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtDTWFrZV0gQ2Fubm90IGxp
bmsgbGliVGVzdFJ1bm5lckluamVjdGVkQnVuZGxlLnNvIGluIG5vbiB1bmlmaWVkIGJ1aWxkCisg
ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjYwODgKKwor
ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb3ZlcmVkIGJ5
IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgIEJhc2VkIG9uIG9yaWdpbmFsIHBhdGNoIGJ5IEFk
cmlhbiBQZXJleiBkZSBDYXN0cm8uCisKKyAgICAgICAgKiBDTWFrZUxpc3RzLnR4dDogTWFrZSBX
ZWJDb3JlIGEgZnJhbWV3b3JrIHVzZWQgYnkgV2ViQ29yZVRlc3RTdXBwb3J0LgorICAgICAgICAq
IGluc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Oklu
c3BlY3RvckNvbnRyb2xsZXI6OmlzVW5kZXJUZXN0IGNvbnN0KTogRGVmaW5pbmcgaXQuCisgICAg
ICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuaDogRXhwb3J0IGlzVW5kZXJUZXN0
KCkuCisgICAgICAgICogbG9hZGVyL1N1YnJlc291cmNlSW50ZWdyaXR5Lmg6IEFkZCBtaXNzaW5n
IGhlYWRlci4KKyAgICAgICAgKiBzdmcvZ3JhcGhpY3MvZmlsdGVycy9TVkdGRUltYWdlLmg6IERp
dHRvLgorICAgICAgICAqIHRlc3RpbmcvSW50ZXJuYWxzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6
OkludGVybmFsczo6bWVkaWFTZXNzaW9uU3RhdGUpOiBDYXN0IG5ldyBlbnVtIHRvIHRoZSBXZWJD
b3JlCisgICAgICAgIG9uZS4KKyAgICAgICAgKiB0ZXN0aW5nL0ludGVybmFscy5oOiBSZWRlZmlu
ZSBNZWRpYVNlc3Npb25TdGF0ZSBhcyBhIG5ldyBlbnVtCisgICAgICAgIGluc3RlYWQgb2YgYWxp
YXNpbmcgdG8gYXZvaWQgcmVkZWZpbml0aW9ucyBvZgorICAgICAgICBjb252ZXJ0RW51bWVyYXRp
b25Ub1N0cmluZyBpbiBub24tdW5pZmllZCBidWlsZHMuCisKIDIwMjEtMTItMTEgIExhdXJvIE1v
dXJhICA8bG1vdXJhQGlnYWxpYS5jb20+CiAKICAgICAgICAgTm9uLXVuaWZpZWQgYnVpbGQgZml4
ZXMsIG1pZCBtaWQgRGVjZW1iZXIgMjAyMSBlZGl0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi
Q29yZS9DTWFrZUxpc3RzLnR4dCBiL1NvdXJjZS9XZWJDb3JlL0NNYWtlTGlzdHMudHh0CmluZGV4
IDQ3MzI4MzhmMjQ2ZTBiMmIxNGZkMDFhMGNkNjI0M2UwYjYzMTE1ZDUuLjg5YjFiMDIzZjQyOTUw
YTlkNmY2M2ZlYjk3OTgwOGQ1MjJkYTgxMjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NN
YWtlTGlzdHMudHh0CisrKyBiL1NvdXJjZS9XZWJDb3JlL0NNYWtlTGlzdHMudHh0CkBAIC0xNzIw
LDcgKzE3MjAsNyBAQCBlbHNlICgpCiAgICAgZW5kaWYgKCkKIGVuZGlmICgpCiAKLXNldChXZWJD
b3JlVGVzdFN1cHBvcnRfRlJBTUVXT1JLUyAke1dlYkNvcmVfRlJBTUVXT1JLU30pCitzZXQoV2Vi
Q29yZVRlc3RTdXBwb3J0X0ZSQU1FV09SS1MgV2ViQ29yZSkKIHNldChXZWJDb3JlVGVzdFN1cHBv
cnRfREVQRU5ERU5DSUVTIFdlYkNvcmVUZXN0U3VwcG9ydEJpbmRpbmdzKQogc2V0KFdlYkNvcmVU
ZXN0U3VwcG9ydF9QUklWQVRFX0hFQURFUlMgdGVzdGluZy9qcy9XZWJDb3JlVGVzdFN1cHBvcnQu
aCkKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRy
b2xsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIu
Y3BwCmluZGV4IDgzM2MwYmE4NDRmODdiY2VkOWIyNDMwMTM4ZWM3Njc2Yzg4M2JmZmMuLjBlYTVk
NzdmZTVhMzVmOGJjYWE1MWIzNjNhNThkYjFlZTAzODYzNzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X
ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2Vi
Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKQEAgLTM1OSw2ICszNTksMTEg
QEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpnZXRIaWdobGlnaHQoSW5zcGVjdG9yT3Zlcmxh
eTo6SGlnaGxpZ2h0JiBoaWdobGlnaHQsIEkKICAgICBtX292ZXJsYXktPmdldEhpZ2hsaWdodCho
aWdobGlnaHQsIGNvb3JkaW5hdGVTeXN0ZW0pOwogfQogCitib29sIEluc3BlY3RvckNvbnRyb2xs
ZXI6OmlzVW5kZXJUZXN0KCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9pc1VuZGVyVGVzdDsKK30K
KwogdW5zaWduZWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6Z3JpZE92ZXJsYXlDb3VudCgpIGNvbnN0
CiB7CiAgICAgcmV0dXJuIG1fb3ZlcmxheS0+Z3JpZE92ZXJsYXlDb3VudCgpOwpkaWZmIC0tZ2l0
IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuaCBiL1NvdXJj
ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmgKaW5kZXggZjZmZWM3Y2Zi
Y2JkMmQ3ZmJhMzBiZGQzMTM4ZTBlZGZiM2Y2OTA1NC4uN2U4NzUyZDE1NmJkMGFlYzc4N2ViMWMw
NTZiZTExZjM3Y2IxNmI5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu
c3BlY3RvckNvbnRyb2xsZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj
dG9yQ29udHJvbGxlci5oCkBAIC0xMDIsNyArMTAyLDcgQEAgcHVibGljOgogICAgIFdFQkNPUkVf
RVhQT1JUIHZvaWQgZGlkQ29tcG9zaXRlKEZyYW1lJik7CiAKICAgICAvLyBUZXN0aW5nIHN1cHBv
cnQuCi0gICAgYm9vbCBpc1VuZGVyVGVzdCgpIGNvbnN0IHsgcmV0dXJuIG1faXNVbmRlclRlc3Q7
IH0KKyAgICBXRUJDT1JFX0VYUE9SVCBib29sIGlzVW5kZXJUZXN0KCkgY29uc3Q7CiAgICAgdm9p
ZCBzZXRJc1VuZGVyVGVzdChib29sIGlzVW5kZXJUZXN0KSB7IG1faXNVbmRlclRlc3QgPSBpc1Vu
ZGVyVGVzdDsgfQogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgZXZhbHVhdGVGb3JUZXN0SW5Gcm9u
dGVuZChjb25zdCBTdHJpbmcmIHNjcmlwdCk7CiAgICAgV0VCQ09SRV9FWFBPUlQgdW5zaWduZWQg
Z3JpZE92ZXJsYXlDb3VudCgpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9h
ZGVyL1N1YnJlc291cmNlSW50ZWdyaXR5LmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvU3VicmVz
b3VyY2VJbnRlZ3JpdHkuaAppbmRleCAyNTM1YjhjMzZhMzg0ZWI4MDRhYzZmNzU3M2M0ZGNkMmM2
ZGY3NmU2Li5jM2QyOWJlNjQxMzExODE4MGYxNTliMzU1YWRmYWZhNWRmNWFkNjRlIDEwMDY0NAot
LS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvU3VicmVzb3VyY2VJbnRlZ3JpdHkuaAorKysgYi9T
b3VyY2UvV2ViQ29yZS9sb2FkZXIvU3VicmVzb3VyY2VJbnRlZ3JpdHkuaApAQCAtMjUsNiArMjUs
NyBAQAogCiAjcHJhZ21hIG9uY2UKIAorI2luY2x1ZGUgIlJlc291cmNlQ3J5cHRvZ3JhcGhpY0Rp
Z2VzdC5oIgogI2luY2x1ZGUgPHd0Zi9Gb3J3YXJkLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsK
ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9ncmFwaGljcy9maWx0ZXJzL1NWR0ZFSW1h
Z2UuaCBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9ncmFwaGljcy9maWx0ZXJzL1NWR0ZFSW1hZ2UuaApp
bmRleCAxZjdlODMyNjJiOWNiOTIzMGEzYTNjOWVjNTMxOWFhMTkzZGRlODE0Li5jNmQ0YzhkZDli
YWRmODYxOWQxY2RkOWVjNDI0NDA4ODFjZTFiNDQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y
ZS9zdmcvZ3JhcGhpY3MvZmlsdGVycy9TVkdGRUltYWdlLmgKKysrIGIvU291cmNlL1dlYkNvcmUv
c3ZnL2dyYXBoaWNzL2ZpbHRlcnMvU1ZHRkVJbWFnZS5oCkBAIC0yNSw2ICsyNSw3IEBACiAKICNp
bmNsdWRlICJGaWx0ZXJFZmZlY3QuaCIKICNpbmNsdWRlICJJbWFnZS5oIgorI2luY2x1ZGUgIklt
YWdlQnVmZmVyLmgiCiAjaW5jbHVkZSAiU1ZHUHJlc2VydmVBc3BlY3RSYXRpb1ZhbHVlLmgiCiAK
IG5hbWVzcGFjZSBXZWJDb3JlIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Rlc3Rpbmcv
SW50ZXJuYWxzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcAppbmRl
eCBkOGQ3MTRhY2YyNTVjYTcxZGU4MmU5MDgyNzg5YzMzZGM5OThhNzRhLi5iZWRjYjU5ZThlZDYw
N2UwNjZhYjRlM2IyMjYwMWVjMGE5MTY4NjYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS90
ZXN0aW5nL0ludGVybmFscy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5h
bHMuY3BwCkBAIC00NTMwLDcgKzQ1MzAsNyBAQCBSZWZQdHI8SFRNTE1lZGlhRWxlbWVudD4gSW50
ZXJuYWxzOjpiZXN0TWVkaWFFbGVtZW50Rm9yUmVtb3RlQ29udHJvbHMoSW50ZXJuYWxzOgogCiBJ
bnRlcm5hbHM6Ok1lZGlhU2Vzc2lvblN0YXRlIEludGVybmFsczo6bWVkaWFTZXNzaW9uU3RhdGUo
SFRNTE1lZGlhRWxlbWVudCYgZWxlbWVudCkKIHsKLSAgICByZXR1cm4gZWxlbWVudC5tZWRpYVNl
c3Npb24oKS5zdGF0ZSgpOworICAgIHJldHVybiBzdGF0aWNfY2FzdDxJbnRlcm5hbHM6Ok1lZGlh
U2Vzc2lvblN0YXRlPihlbGVtZW50Lm1lZGlhU2Vzc2lvbigpLnN0YXRlKCkpOwogfQogI2VuZGlm
CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmggYi9Tb3Vy
Y2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5oCmluZGV4IGZiYzEyMTk1MWVhMzlkZDE0OGQ3
NWFlMjM3NzY0ODgwZjBiM2UxZDUuLmFkNzBiYjRjNTJkY2NiMjZiZGM4NjZmYzM4MGRmOWIyOTE3
MmIyNDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmgKKysr
IGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaApAQCAtMTAwMiw3ICsxMDAyLDE1
IEBAIHB1YmxpYzoKICAgICB1c2luZyBQbGF5YmFja0NvbnRyb2xzUHVycG9zZSA9IE1lZGlhRWxl
bWVudFNlc3Npb246OlBsYXliYWNrQ29udHJvbHNQdXJwb3NlOwogICAgIFJlZlB0cjxIVE1MTWVk
aWFFbGVtZW50PiBiZXN0TWVkaWFFbGVtZW50Rm9yUmVtb3RlQ29udHJvbHMoUGxheWJhY2tDb250
cm9sc1B1cnBvc2UpOwogCi0gICAgdXNpbmcgTWVkaWFTZXNzaW9uU3RhdGUgPSBQbGF0Zm9ybU1l
ZGlhU2Vzc2lvbjo6U3RhdGU7CisgICAgLy8gU2FtZSB2YWx1ZXMgYXMgUGxhdGZvcm1NZWRpYVNl
c3Npb246OlN0YXRlLCBidXQgcmUtZGVjbGFyZWQgdG8gYXZvaWQgcmVkZWZpbml0aW9ucyB3aGVu
IGxpbmtpbmcKKyAgICAvLyBkaXJlY3RseSB3aXRoIGxpYldlYkNvcmUgKGUuZy4gd2l0aCBub24t
dW5pZmllZCBidWlsZHMpCisgICAgZW51bSBNZWRpYVNlc3Npb25TdGF0ZSB7CisgICAgICAgIElk
bGUsCisgICAgICAgIEF1dG9wbGF5aW5nLAorICAgICAgICBQbGF5aW5nLAorICAgICAgICBQYXVz
ZWQsCisgICAgICAgIEludGVycnVwdGVkLAorICAgIH07CiAgICAgTWVkaWFTZXNzaW9uU3RhdGUg
bWVkaWFTZXNzaW9uU3RhdGUoSFRNTE1lZGlhRWxlbWVudCYpOwogCiAgICAgc2l6ZV90IG1lZGlh
RWxlbWVudENvdW50KCkgY29uc3Q7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>447125</attachid>
            <date>2021-12-14 05:10:50 -0800</date>
            <delta_ts>2022-01-18 20:09:09 -0800</delta_ts>
            <desc>Rebased patch</desc>
            <filename>bug-226088-20211214101049.patch</filename>
            <type>text/plain</type>
            <size>6565</size>
            <attacher name="Lauro Moura">lmoura</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MDIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmVkMjVkMmM1MTczMTQ4
ZGI0ZWExZThhMjc3YThjZDBiZGNkNzAyOC4uNmU3NTg1MjE4YTJiOTM3ZjBiYmE5YWZhYzgwYmU5
ZjA1MTAwNjlhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTEyLTEzICBMYXVy
byBNb3VyYSAgPGxtb3VyYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtDTWFrZV0gQ2Fubm90IGxp
bmsgbGliVGVzdFJ1bm5lckluamVjdGVkQnVuZGxlLnNvIGluIG5vbiB1bmlmaWVkIGJ1aWxkCisg
ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjYwODgKKwor
ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb3ZlcmVkIGJ5
IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgIEJhc2VkIG9uIG9yaWdpbmFsIHBhdGNoIGJ5IEFk
cmlhbiBQZXJleiBkZSBDYXN0cm8uCisKKyAgICAgICAgKiBDTWFrZUxpc3RzLnR4dDogTWFrZSBX
ZWJDb3JlIGEgZnJhbWV3b3JrIHVzZWQgYnkgV2ViQ29yZVRlc3RTdXBwb3J0LgorICAgICAgICAq
IGluc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Oklu
c3BlY3RvckNvbnRyb2xsZXI6OmlzVW5kZXJUZXN0IGNvbnN0KTogRGVmaW5pbmcgaXQuCisgICAg
ICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuaDogRXhwb3J0IGlzVW5kZXJUZXN0
KCkuCisgICAgICAgICogbG9hZGVyL1N1YnJlc291cmNlSW50ZWdyaXR5Lmg6IEFkZCBtaXNzaW5n
IGhlYWRlci4KKyAgICAgICAgKiBzdmcvZ3JhcGhpY3MvZmlsdGVycy9TVkdGRUltYWdlLmg6IERp
dHRvLgorICAgICAgICAqIHRlc3RpbmcvSW50ZXJuYWxzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6
OkludGVybmFsczo6bWVkaWFTZXNzaW9uU3RhdGUpOiBDYXN0IG5ldyBlbnVtIHRvIHRoZSBXZWJD
b3JlCisgICAgICAgIG9uZS4KKyAgICAgICAgKiB0ZXN0aW5nL0ludGVybmFscy5oOiBSZWRlZmlu
ZSBNZWRpYVNlc3Npb25TdGF0ZSBhcyBhIG5ldyBlbnVtCisgICAgICAgIGluc3RlYWQgb2YgYWxp
YXNpbmcgdG8gYXZvaWQgcmVkZWZpbml0aW9ucyBvZgorICAgICAgICBjb252ZXJ0RW51bWVyYXRp
b25Ub1N0cmluZyBpbiBub24tdW5pZmllZCBidWlsZHMuCisgICAgICAgICogd29ya2Vycy9Xb3Jr
ZXJDb25zb2xlQ2xpZW50Lmg6IEFsaWFzIE1lc3NhZ2VUeXBlLgorCiAyMDIxLTEyLTE0ICBKZWFu
LVl2ZXMgQXZlbmFyZCAgPGp5YUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVuYW1lIFNoYXJlZEJ1
ZmZlciBjbGFzc2VzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ01ha2VMaXN0cy50eHQg
Yi9Tb3VyY2UvV2ViQ29yZS9DTWFrZUxpc3RzLnR4dAppbmRleCAwOTc3MzQ4OGRiMGE4YjI4YmRk
YzI5MmQ2NTkxOTJmMjNjMzQ0ZTdiLi5iZTczOTExNWFkNjVhOTNkNTkwN2ZkZTExNjYxYTg4Mzgx
ZTM3YTFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DTWFrZUxpc3RzLnR4dAorKysgYi9T
b3VyY2UvV2ViQ29yZS9DTWFrZUxpc3RzLnR4dApAQCAtMTcyMSw3ICsxNzIxLDcgQEAgZWxzZSAo
KQogICAgIGVuZGlmICgpCiBlbmRpZiAoKQogCi1zZXQoV2ViQ29yZVRlc3RTdXBwb3J0X0ZSQU1F
V09SS1MgJHtXZWJDb3JlX0ZSQU1FV09SS1N9KQorc2V0KFdlYkNvcmVUZXN0U3VwcG9ydF9GUkFN
RVdPUktTIFdlYkNvcmUpCiBzZXQoV2ViQ29yZVRlc3RTdXBwb3J0X0RFUEVOREVOQ0lFUyBXZWJD
b3JlVGVzdFN1cHBvcnRCaW5kaW5ncykKIHNldChXZWJDb3JlVGVzdFN1cHBvcnRfUFJJVkFURV9I
RUFERVJTIHRlc3RpbmcvanMvV2ViQ29yZVRlc3RTdXBwb3J0LmgpCiAKZGlmZiAtLWdpdCBhL1Nv
dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9X
ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcAppbmRleCA4MzNjMGJhODQ0
Zjg3YmNlZDliMjQzMDEzOGVjNzY3NmM4ODNiZmZjLi4wZWE1ZDc3ZmU1YTM1ZjhiY2FhNTFiMzYz
YTU4ZGIxZWUwMzg2Mzc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z
cGVjdG9yQ29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl
Y3RvckNvbnRyb2xsZXIuY3BwCkBAIC0zNTksNiArMzU5LDExIEBAIHZvaWQgSW5zcGVjdG9yQ29u
dHJvbGxlcjo6Z2V0SGlnaGxpZ2h0KEluc3BlY3Rvck92ZXJsYXk6OkhpZ2hsaWdodCYgaGlnaGxp
Z2h0LCBJCiAgICAgbV9vdmVybGF5LT5nZXRIaWdobGlnaHQoaGlnaGxpZ2h0LCBjb29yZGluYXRl
U3lzdGVtKTsKIH0KIAorYm9vbCBJbnNwZWN0b3JDb250cm9sbGVyOjppc1VuZGVyVGVzdCgpIGNv
bnN0Cit7CisgICAgcmV0dXJuIG1faXNVbmRlclRlc3Q7Cit9CisKIHVuc2lnbmVkIEluc3BlY3Rv
ckNvbnRyb2xsZXI6OmdyaWRPdmVybGF5Q291bnQoKSBjb25zdAogewogICAgIHJldHVybiBtX292
ZXJsYXktPmdyaWRPdmVybGF5Q291bnQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu
c3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv
SW5zcGVjdG9yQ29udHJvbGxlci5oCmluZGV4IGY2ZmVjN2NmYmNiZDJkN2ZiYTMwYmRkMzEzOGUw
ZWRmYjNmNjkwNTQuLjdlODc1MmQxNTZiZDBhZWM3ODdlYjFjMDU2YmUxMWYzN2NiMTZiOWUgMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmgK
KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuaApAQCAt
MTAyLDcgKzEwMiw3IEBAIHB1YmxpYzoKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIGRpZENvbXBv
c2l0ZShGcmFtZSYpOwogCiAgICAgLy8gVGVzdGluZyBzdXBwb3J0LgotICAgIGJvb2wgaXNVbmRl
clRlc3QoKSBjb25zdCB7IHJldHVybiBtX2lzVW5kZXJUZXN0OyB9CisgICAgV0VCQ09SRV9FWFBP
UlQgYm9vbCBpc1VuZGVyVGVzdCgpIGNvbnN0OwogICAgIHZvaWQgc2V0SXNVbmRlclRlc3QoYm9v
bCBpc1VuZGVyVGVzdCkgeyBtX2lzVW5kZXJUZXN0ID0gaXNVbmRlclRlc3Q7IH0KICAgICBXRUJD
T1JFX0VYUE9SVCB2b2lkIGV2YWx1YXRlRm9yVGVzdEluRnJvbnRlbmQoY29uc3QgU3RyaW5nJiBz
Y3JpcHQpOwogICAgIFdFQkNPUkVfRVhQT1JUIHVuc2lnbmVkIGdyaWRPdmVybGF5Q291bnQoKSBj
b25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUludGVn
cml0eS5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YnJlc291cmNlSW50ZWdyaXR5LmgKaW5k
ZXggOTQzYzQ1MTA0Zjg2NmM4NDAyNjczZmUxOTI4NjIyZjIyNGFkMDZmMS4uOWM1MGU2NWQ3YjMz
ZTc0ZjUyMjA2NDg1ZGMzNjEwMWYxY2Q4MjJlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv
bG9hZGVyL1N1YnJlc291cmNlSW50ZWdyaXR5LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVy
L1N1YnJlc291cmNlSW50ZWdyaXR5LmgKQEAgLTI1LDEzICsyNSwxNCBAQAogCiAjcHJhZ21hIG9u
Y2UKIAorI2luY2x1ZGUgIlJlc291cmNlQ3J5cHRvZ3JhcGhpY0RpZ2VzdC5oIgorCiAjaW5jbHVk
ZSA8b3B0aW9uYWw+CiAjaW5jbHVkZSA8d3RmL0ZvcndhcmQuaD4KIAogbmFtZXNwYWNlIFdlYkNv
cmUgewogCiBjbGFzcyBDYWNoZWRSZXNvdXJjZTsKLXN0cnVjdCBFbmNvZGVkUmVzb3VyY2VDcnlw
dG9ncmFwaGljRGlnZXN0OwogCiBib29sIG1hdGNoSW50ZWdyaXR5TWV0YWRhdGEoY29uc3QgQ2Fj
aGVkUmVzb3VyY2UmLCBjb25zdCBTdHJpbmcmIGludGVncml0eU1ldGFkYXRhKTsKIFN0cmluZyBp
bnRlZ3JpdHlNaXNtYXRjaERlc2NyaXB0aW9uKGNvbnN0IENhY2hlZFJlc291cmNlJiwgY29uc3Qg
U3RyaW5nJiBpbnRlZ3JpdHlNZXRhZGF0YSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9z
dmcvZ3JhcGhpY3MvZmlsdGVycy9TVkdGRUltYWdlLmggYi9Tb3VyY2UvV2ViQ29yZS9zdmcvZ3Jh
cGhpY3MvZmlsdGVycy9TVkdGRUltYWdlLmgKaW5kZXggMWY3ZTgzMjYyYjljYjkyMzBhM2EzYzll
YzUzMTlhYTE5M2RkZTgxNC4uYzZkNGM4ZGQ5YmFkZjg2MTlkMWNkZDllYzQyNDQwODgxY2UxYjQ0
MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3ZnL2dyYXBoaWNzL2ZpbHRlcnMvU1ZHRkVJ
bWFnZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9ncmFwaGljcy9maWx0ZXJzL1NWR0ZFSW1h
Z2UuaApAQCAtMjUsNiArMjUsNyBAQAogCiAjaW5jbHVkZSAiRmlsdGVyRWZmZWN0LmgiCiAjaW5j
bHVkZSAiSW1hZ2UuaCIKKyNpbmNsdWRlICJJbWFnZUJ1ZmZlci5oIgogI2luY2x1ZGUgIlNWR1By
ZXNlcnZlQXNwZWN0UmF0aW9WYWx1ZS5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CmRpZmYgLS1n
aXQgYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAgYi9Tb3VyY2UvV2ViQ29y
ZS90ZXN0aW5nL0ludGVybmFscy5jcHAKaW5kZXggZDhkNzE0YWNmMjU1Y2E3MWRlODJlOTA4Mjc4
OWMzM2RjOTk4YTc0YS4uYmVkY2I1OWU4ZWQ2MDdlMDY2YWI0ZTNiMjI2MDFlYzBhOTE2ODY2MyAx
MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcApAQCAtNDUzMCw3ICs0NTMwLDcgQEAg
UmVmUHRyPEhUTUxNZWRpYUVsZW1lbnQ+IEludGVybmFsczo6YmVzdE1lZGlhRWxlbWVudEZvclJl
bW90ZUNvbnRyb2xzKEludGVybmFsczoKIAogSW50ZXJuYWxzOjpNZWRpYVNlc3Npb25TdGF0ZSBJ
bnRlcm5hbHM6Om1lZGlhU2Vzc2lvblN0YXRlKEhUTUxNZWRpYUVsZW1lbnQmIGVsZW1lbnQpCiB7
Ci0gICAgcmV0dXJuIGVsZW1lbnQubWVkaWFTZXNzaW9uKCkuc3RhdGUoKTsKKyAgICByZXR1cm4g
c3RhdGljX2Nhc3Q8SW50ZXJuYWxzOjpNZWRpYVNlc3Npb25TdGF0ZT4oZWxlbWVudC5tZWRpYVNl
c3Npb24oKS5zdGF0ZSgpKTsKIH0KICNlbmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y
ZS90ZXN0aW5nL0ludGVybmFscy5oIGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMu
aAppbmRleCBmYmMxMjE5NTFlYTM5ZGQxNDhkNzVhZTIzNzc2NDg4MGYwYjNlMWQ1Li5hZDcwYmI0
YzUyZGNjYjI2YmRjODY2ZmMzODBkZjliMjkxNzJiMjQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi
Q29yZS90ZXN0aW5nL0ludGVybmFscy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50
ZXJuYWxzLmgKQEAgLTEwMDIsNyArMTAwMiwxNSBAQCBwdWJsaWM6CiAgICAgdXNpbmcgUGxheWJh
Y2tDb250cm9sc1B1cnBvc2UgPSBNZWRpYUVsZW1lbnRTZXNzaW9uOjpQbGF5YmFja0NvbnRyb2xz
UHVycG9zZTsKICAgICBSZWZQdHI8SFRNTE1lZGlhRWxlbWVudD4gYmVzdE1lZGlhRWxlbWVudEZv
clJlbW90ZUNvbnRyb2xzKFBsYXliYWNrQ29udHJvbHNQdXJwb3NlKTsKIAotICAgIHVzaW5nIE1l
ZGlhU2Vzc2lvblN0YXRlID0gUGxhdGZvcm1NZWRpYVNlc3Npb246OlN0YXRlOworICAgIC8vIFNh
bWUgdmFsdWVzIGFzIFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpTdGF0ZSwgYnV0IHJlLWRlY2xhcmVk
IHRvIGF2b2lkIHJlZGVmaW5pdGlvbnMgd2hlbiBsaW5raW5nCisgICAgLy8gZGlyZWN0bHkgd2l0
aCBsaWJXZWJDb3JlIChlLmcuIHdpdGggbm9uLXVuaWZpZWQgYnVpbGRzKQorICAgIGVudW0gTWVk
aWFTZXNzaW9uU3RhdGUgeworICAgICAgICBJZGxlLAorICAgICAgICBBdXRvcGxheWluZywKKyAg
ICAgICAgUGxheWluZywKKyAgICAgICAgUGF1c2VkLAorICAgICAgICBJbnRlcnJ1cHRlZCwKKyAg
ICB9OwogICAgIE1lZGlhU2Vzc2lvblN0YXRlIG1lZGlhU2Vzc2lvblN0YXRlKEhUTUxNZWRpYUVs
ZW1lbnQmKTsKIAogICAgIHNpemVfdCBtZWRpYUVsZW1lbnRDb3VudCgpIGNvbnN0OwpkaWZmIC0t
Z2l0IGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXJDb25zb2xlQ2xpZW50LmggYi9Tb3Vy
Y2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlckNvbnNvbGVDbGllbnQuaAppbmRleCAxMTRjOGRmZWU0
YjU1MTllNDE0OWI1MThkNzc1NTlhYzY4MDZjMGRmLi5hNzg2MzM1NGUzNjkyY2MxM2ViYzYwYzg2
ZmNmMmIxZmJmNGY3MmUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtl
ckNvbnNvbGVDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlckNvbnNv
bGVDbGllbnQuaApAQCAtMzMsNiArMzMsOCBAQCBuYW1lc3BhY2UgSlNDIHsKIGNsYXNzIENhbGxG
cmFtZTsKIH0KIAordXNpbmcgSlNDOjpNZXNzYWdlVHlwZTsKKwogbmFtZXNwYWNlIFdlYkNvcmUg
ewogCiBjbGFzcyBXb3JrZXJDb25zb2xlQ2xpZW50IGZpbmFsIDogcHVibGljIEpTQzo6Q29uc29s
ZUNsaWVudCB7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>449457</attachid>
            <date>2022-01-18 20:09:17 -0800</date>
            <delta_ts>2022-01-20 16:36:07 -0800</delta_ts>
            <desc>Rebased patch with new nonunified fixes</desc>
            <filename>bug-226088-20220119010915.patch</filename>
            <type>text/plain</type>
            <size>8363</size>
            <attacher name="Lauro Moura">lmoura</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4MTM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw
dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAz
YWVmYmEzZGRmZjlhMjNiODI1MTViOGM2Mjc2NDkwYTk0ZDVkNTMxLi40MWMzNTk1MTc2YjYwNzg2
YTNhZjdiMzJjYTdjMGU4YzlkZTIwYzQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv
cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwxMiBAQAorMjAyMi0wMS0xOCAgTGF1cm8gTW91cmEgIDxsbW91cmFAaWdhbGlhLmNvbT4K
KworICAgICAgICBbQ01ha2VdIENhbm5vdCBsaW5rIGxpYlRlc3RSdW5uZXJJbmplY3RlZEJ1bmRs
ZS5zbyBpbiBub24gdW5pZmllZCBidWlsZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y
Zy9zaG93X2J1Zy5jZ2k/aWQ9MjI2MDg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWRyaWFuIFBl
cmV6IGRlIENhc3Ryby4KKworICAgICAgICAqIHdhc20vanMvSlNXZWJBc3NlbWJseU1vZHVsZS5o
OiBBZGQgbWlzc2luZyBoZWFkZXIuCisKIDIwMjItMDEtMTggIEFkcmlhbiBQZXJleiBkZSBDYXN0
cm8gIDxhcGVyZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBOb24tdW5pZmllZCBidWlsZCBmYWls
cyBkdWUgdG8gbWlzc2luZyBoZWFkZXIgaW4gV2FzbUNhbGxlZUdyb3VwLmNwcApkaWZmIC0tZ2l0
IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmlu
ZGV4IGU1MzI3MGE0NTc1MGUyZjYxY2EzY2I3NzNkNGM1ZGQxYzg0ZDliNGYuLmQ3OTk0MGIwNTU4
ZTk2MTAxNWI4NjQyZDIzYTEyZDVlZjY3MDgxZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl
L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOSBA
QAorMjAyMi0wMS0xOCAgTGF1cm8gTW91cmEgIDxsbW91cmFAaWdhbGlhLmNvbT4KKworICAgICAg
ICBbQ01ha2VdIENhbm5vdCBsaW5rIGxpYlRlc3RSdW5uZXJJbmplY3RlZEJ1bmRsZS5zbyBpbiBu
b24gdW5pZmllZCBidWlsZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1
Zy5jZ2k/aWQ9MjI2MDg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWRyaWFuIFBlcmV6IGRlIENh
c3Ryby4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgIEJh
c2VkIG9uIG9yaWdpbmFsIHBhdGNoIGJ5IEFkcmlhbiBQZXJleiBkZSBDYXN0cm8uCisKKyAgICAg
ICAgKiBDTWFrZUxpc3RzLnR4dDogTWFrZSBXZWJDb3JlIGEgZnJhbWV3b3JrIHVzZWQgYnkgV2Vi
Q29yZVRlc3RTdXBwb3J0LgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVy
LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OmlzVW5kZXJUZXN0
IGNvbnN0KTogRGVmaW5pbmcgaXQuCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNvbnRy
b2xsZXIuaDogRXhwb3J0IGlzVW5kZXJUZXN0KCkuCisgICAgICAgICogbG9hZGVyL1N1YnJlc291
cmNlSW50ZWdyaXR5Lmg6IEFkZCBtaXNzaW5nIGhlYWRlci4KKyAgICAgICAgKiBwbGF0Zm9ybS9n
dGsvVmFsaWRhdGlvbkJ1YmJsZUd0ay5jcHA6IERpdHRvLgorICAgICAgICAqIHN2Zy9ncmFwaGlj
cy9maWx0ZXJzL1NWR0ZFSW1hZ2UuaDogRGl0dG8uCisgICAgICAgICogdGVzdGluZy9JbnRlcm5h
bHMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW50ZXJuYWxzOjptZWRpYVNlc3Npb25TdGF0ZSk6
IENhc3QgbmV3IGVudW0gdG8gdGhlIFdlYkNvcmUKKyAgICAgICAgb25lLgorICAgICAgICAqIHRl
c3RpbmcvSW50ZXJuYWxzLmg6IFJlZGVmaW5lIE1lZGlhU2Vzc2lvblN0YXRlIGFzIGEgbmV3IGVu
dW0KKyAgICAgICAgaW5zdGVhZCBvZiBhbGlhc2luZyB0byBhdm9pZCByZWRlZmluaXRpb25zIG9m
CisgICAgICAgIGNvbnZlcnRFbnVtZXJhdGlvblRvU3RyaW5nIGluIG5vbi11bmlmaWVkIGJ1aWxk
cy4KKyAgICAgICAgKiB3b3JrZXJzL1dvcmtlckNvbnNvbGVDbGllbnQuaDogQWxpYXMgTWVzc2Fn
ZVR5cGUuCisKIDIwMjItMDEtMTggIFNhbSBXZWluaWcgIDx3ZWluaWdAYXBwbGUuY29tPgogCiAg
ICAgICAgIENhbnZhcyBmdW5jdGlvbnMgdGhhdCB0YWtlIGNvbG9ycyBhcyBzdHJpbmdzIGRvbid0
IHN1cHBvcnQgYWxsIHRoZSBzeW50YXggdGhhdCBDU1Mgc3VwcG9ydHMKZGlmZiAtLWdpdCBhL1Nv
dXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL2pzL0pTV2ViQXNzZW1ibHlNb2R1bGUuaCBiL1NvdXJj
ZS9KYXZhU2NyaXB0Q29yZS93YXNtL2pzL0pTV2ViQXNzZW1ibHlNb2R1bGUuaAppbmRleCAwNzFl
NjU2OTA4ODA1MTg4YzUxMDQ0ZThiOTdhMjA0NTNkOThjMTZlLi43N2UxOTg4NzkwZDMyNzlkMjZj
NDJhZWM5MjUzYjdkNjIxMGU3MWZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv
d2FzbS9qcy9KU1dlYkFzc2VtYmx5TW9kdWxlLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl
L3dhc20vanMvSlNXZWJBc3NlbWJseU1vZHVsZS5oCkBAIC0yNyw2ICsyNyw3IEBACiAKICNpZiBF
TkFCTEUoV0VCQVNTRU1CTFkpCiAKKyNpbmNsdWRlICJDYWxsTGlua0luZm8uaCIKICNpbmNsdWRl
ICJKU0Rlc3RydWN0aWJsZU9iamVjdC5oIgogI2luY2x1ZGUgIkpTT2JqZWN0LmgiCiAjaW5jbHVk
ZSAiV2FzbU1lbW9yeU1vZGUuaCIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NNYWtlTGlz
dHMudHh0IGIvU291cmNlL1dlYkNvcmUvQ01ha2VMaXN0cy50eHQKaW5kZXggOTc4YTM4NjhhOGY0
NzUyN2YyMWIyMDAzZmE4OWI2ODZlZGFhNTg4NS4uYzFhOTZkN2MwN2I5MzIyNWU3ZTJkZTIyZTEy
ZDM4YjdjN2JkNWJlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ01ha2VMaXN0cy50eHQK
KysrIGIvU291cmNlL1dlYkNvcmUvQ01ha2VMaXN0cy50eHQKQEAgLTE3MjIsNyArMTcyMiw3IEBA
IGVsc2UgKCkKICAgICBlbmRpZiAoKQogZW5kaWYgKCkKIAotc2V0KFdlYkNvcmVUZXN0U3VwcG9y
dF9GUkFNRVdPUktTICR7V2ViQ29yZV9GUkFNRVdPUktTfSkKK3NldChXZWJDb3JlVGVzdFN1cHBv
cnRfRlJBTUVXT1JLUyBXZWJDb3JlKQogc2V0KFdlYkNvcmVUZXN0U3VwcG9ydF9ERVBFTkRFTkNJ
RVMgV2ViQ29yZVRlc3RTdXBwb3J0QmluZGluZ3MpCiBzZXQoV2ViQ29yZVRlc3RTdXBwb3J0X1BS
SVZBVEVfSEVBREVSUyB0ZXN0aW5nL2pzL1dlYkNvcmVUZXN0U3VwcG9ydC5oKQogCmRpZmYgLS1n
aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAgYi9T
b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKaW5kZXggODMz
YzBiYTg0NGY4N2JjZWQ5YjI0MzAxMzhlYzc2NzZjODgzYmZmYy4uMGVhNWQ3N2ZlNWEzNWY4YmNh
YTUxYjM2M2E1OGRiMWVlMDM4NjM3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj
dG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv
ci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcApAQCAtMzU5LDYgKzM1OSwxMSBAQCB2b2lkIEluc3Bl
Y3RvckNvbnRyb2xsZXI6OmdldEhpZ2hsaWdodChJbnNwZWN0b3JPdmVybGF5OjpIaWdobGlnaHQm
IGhpZ2hsaWdodCwgSQogICAgIG1fb3ZlcmxheS0+Z2V0SGlnaGxpZ2h0KGhpZ2hsaWdodCwgY29v
cmRpbmF0ZVN5c3RlbSk7CiB9CiAKK2Jvb2wgSW5zcGVjdG9yQ29udHJvbGxlcjo6aXNVbmRlclRl
c3QoKSBjb25zdAoreworICAgIHJldHVybiBtX2lzVW5kZXJUZXN0OworfQorCiB1bnNpZ25lZCBJ
bnNwZWN0b3JDb250cm9sbGVyOjpncmlkT3ZlcmxheUNvdW50KCkgY29uc3QKIHsKICAgICByZXR1
cm4gbV9vdmVybGF5LT5ncmlkT3ZlcmxheUNvdW50KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi
Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5oIGIvU291cmNlL1dlYkNvcmUvaW5z
cGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuaAppbmRleCBmNmZlYzdjZmJjYmQyZDdmYmEzMGJk
ZDMxMzhlMGVkZmIzZjY5MDU0Li43ZTg3NTJkMTU2YmQwYWVjNzg3ZWIxYzA1NmJlMTFmMzdjYjE2
YjllIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJv
bGxlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVy
LmgKQEAgLTEwMiw3ICsxMDIsNyBAQCBwdWJsaWM6CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBk
aWRDb21wb3NpdGUoRnJhbWUmKTsKIAogICAgIC8vIFRlc3Rpbmcgc3VwcG9ydC4KLSAgICBib29s
IGlzVW5kZXJUZXN0KCkgY29uc3QgeyByZXR1cm4gbV9pc1VuZGVyVGVzdDsgfQorICAgIFdFQkNP
UkVfRVhQT1JUIGJvb2wgaXNVbmRlclRlc3QoKSBjb25zdDsKICAgICB2b2lkIHNldElzVW5kZXJU
ZXN0KGJvb2wgaXNVbmRlclRlc3QpIHsgbV9pc1VuZGVyVGVzdCA9IGlzVW5kZXJUZXN0OyB9CiAg
ICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBldmFsdWF0ZUZvclRlc3RJbkZyb250ZW5kKGNvbnN0IFN0
cmluZyYgc2NyaXB0KTsKICAgICBXRUJDT1JFX0VYUE9SVCB1bnNpZ25lZCBncmlkT3ZlcmxheUNv
dW50KCkgY29uc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvU3VicmVzb3Vy
Y2VJbnRlZ3JpdHkuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUludGVncml0
eS5oCmluZGV4IDk0M2M0NTEwNGY4NjZjODQwMjY3M2ZlMTkyODYyMmYyMjRhZDA2ZjEuLjljNTBl
NjVkN2IzM2U3NGY1MjIwNjQ4NWRjMzYxMDFmMWNkODIyZWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X
ZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUludGVncml0eS5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl
L2xvYWRlci9TdWJyZXNvdXJjZUludGVncml0eS5oCkBAIC0yNSwxMyArMjUsMTQgQEAKIAogI3By
YWdtYSBvbmNlCiAKKyNpbmNsdWRlICJSZXNvdXJjZUNyeXB0b2dyYXBoaWNEaWdlc3QuaCIKKwog
I2luY2x1ZGUgPG9wdGlvbmFsPgogI2luY2x1ZGUgPHd0Zi9Gb3J3YXJkLmg+CiAKIG5hbWVzcGFj
ZSBXZWJDb3JlIHsKIAogY2xhc3MgQ2FjaGVkUmVzb3VyY2U7Ci1zdHJ1Y3QgRW5jb2RlZFJlc291
cmNlQ3J5cHRvZ3JhcGhpY0RpZ2VzdDsKIAogYm9vbCBtYXRjaEludGVncml0eU1ldGFkYXRhKGNv
bnN0IENhY2hlZFJlc291cmNlJiwgY29uc3QgU3RyaW5nJiBpbnRlZ3JpdHlNZXRhZGF0YSk7CiBT
dHJpbmcgaW50ZWdyaXR5TWlzbWF0Y2hEZXNjcmlwdGlvbihjb25zdCBDYWNoZWRSZXNvdXJjZSYs
IGNvbnN0IFN0cmluZyYgaW50ZWdyaXR5TWV0YWRhdGEpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YkNvcmUvcGxhdGZvcm0vZ3RrL1ZhbGlkYXRpb25CdWJibGVHdGsuY3BwIGIvU291cmNlL1dlYkNv
cmUvcGxhdGZvcm0vZ3RrL1ZhbGlkYXRpb25CdWJibGVHdGsuY3BwCmluZGV4IDQ2ZjlmYTA1OWIz
NzkwNWQ2YTE0ZjgwMGNjMjI4Nzc5NzhmN2RlZjAuLjU3MGIxMjdjYjI2OWZjZjcxN2E0MmUwMTY0
NmNhMzU1OGRkMWQ3MzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9W
YWxpZGF0aW9uQnViYmxlR3RrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsv
VmFsaWRhdGlvbkJ1YmJsZUd0ay5jcHAKQEAgLTI5LDYgKzI5LDcgQEAKICNpZiBQTEFURk9STShH
VEspCiAKICNpbmNsdWRlIDxnbGliLmg+CisjaW5jbHVkZSA8Z3RrL2d0ay5oPgogI2luY2x1ZGUg
PHd0Zi9nbGliL0dVbmlxdWVQdHIuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4K
IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3ZnL2dyYXBoaWNzL2ZpbHRlcnMvU1ZHRkVJ
bWFnZS5oIGIvU291cmNlL1dlYkNvcmUvc3ZnL2dyYXBoaWNzL2ZpbHRlcnMvU1ZHRkVJbWFnZS5o
CmluZGV4IDFmN2U4MzI2MmI5Y2I5MjMwYTNhM2M5ZWM1MzE5YWExOTNkZGU4MTQuLmM2ZDRjOGRk
OWJhZGY4NjE5ZDFjZGQ5ZWM0MjQ0MDg4MWNlMWI0NDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD
b3JlL3N2Zy9ncmFwaGljcy9maWx0ZXJzL1NWR0ZFSW1hZ2UuaAorKysgYi9Tb3VyY2UvV2ViQ29y
ZS9zdmcvZ3JhcGhpY3MvZmlsdGVycy9TVkdGRUltYWdlLmgKQEAgLTI1LDYgKzI1LDcgQEAKIAog
I2luY2x1ZGUgIkZpbHRlckVmZmVjdC5oIgogI2luY2x1ZGUgIkltYWdlLmgiCisjaW5jbHVkZSAi
SW1hZ2VCdWZmZXIuaCIKICNpbmNsdWRlICJTVkdQcmVzZXJ2ZUFzcGVjdFJhdGlvVmFsdWUuaCIK
IAogbmFtZXNwYWNlIFdlYkNvcmUgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvdGVzdGlu
Zy9JbnRlcm5hbHMuY3BwIGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwCmlu
ZGV4IDg1Y2UyNDJkYzY1M2NmYzlmMzA3NDc1ZWM1ZGM2MWViNjAzYTY1MzQuLjdlOGYzZmFlMzYx
OTYyOTI5ZGNkMDY5MTRlYjE5N2IzNjQ5ZjQ5MjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl
L3Rlc3RpbmcvSW50ZXJuYWxzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVy
bmFscy5jcHAKQEAgLTQ1NDAsNyArNDU0MCw3IEBAIFJlZlB0cjxIVE1MTWVkaWFFbGVtZW50PiBJ
bnRlcm5hbHM6OmJlc3RNZWRpYUVsZW1lbnRGb3JSZW1vdGVDb250cm9scyhJbnRlcm5hbHM6CiAK
IEludGVybmFsczo6TWVkaWFTZXNzaW9uU3RhdGUgSW50ZXJuYWxzOjptZWRpYVNlc3Npb25TdGF0
ZShIVE1MTWVkaWFFbGVtZW50JiBlbGVtZW50KQogewotICAgIHJldHVybiBlbGVtZW50Lm1lZGlh
U2Vzc2lvbigpLnN0YXRlKCk7CisgICAgcmV0dXJuIHN0YXRpY19jYXN0PEludGVybmFsczo6TWVk
aWFTZXNzaW9uU3RhdGU+KGVsZW1lbnQubWVkaWFTZXNzaW9uKCkuc3RhdGUoKSk7CiB9CiAjZW5k
aWYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaCBiL1Nv
dXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmgKaW5kZXggYTFjMzlmN2JhNGQwMWFhMTA3
ZGI1YjRmMmRjNmVhNDMwODVhMWIxMS4uNmEzMzg4YWZiM2UwZWY5NTdjMTg0ZGIzYjljMmVhMTQ0
YjE1NWFjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaAor
KysgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5oCkBAIC0xMDEwLDcgKzEwMTAs
MTUgQEAgcHVibGljOgogICAgIHVzaW5nIFBsYXliYWNrQ29udHJvbHNQdXJwb3NlID0gTWVkaWFF
bGVtZW50U2Vzc2lvbjo6UGxheWJhY2tDb250cm9sc1B1cnBvc2U7CiAgICAgUmVmUHRyPEhUTUxN
ZWRpYUVsZW1lbnQ+IGJlc3RNZWRpYUVsZW1lbnRGb3JSZW1vdGVDb250cm9scyhQbGF5YmFja0Nv
bnRyb2xzUHVycG9zZSk7CiAKLSAgICB1c2luZyBNZWRpYVNlc3Npb25TdGF0ZSA9IFBsYXRmb3Jt
TWVkaWFTZXNzaW9uOjpTdGF0ZTsKKyAgICAvLyBTYW1lIHZhbHVlcyBhcyBQbGF0Zm9ybU1lZGlh
U2Vzc2lvbjo6U3RhdGUsIGJ1dCByZS1kZWNsYXJlZCB0byBhdm9pZCByZWRlZmluaXRpb25zIHdo
ZW4gbGlua2luZworICAgIC8vIGRpcmVjdGx5IHdpdGggbGliV2ViQ29yZSAoZS5nLiB3aXRoIG5v
bi11bmlmaWVkIGJ1aWxkcykKKyAgICBlbnVtIE1lZGlhU2Vzc2lvblN0YXRlIHsKKyAgICAgICAg
SWRsZSwKKyAgICAgICAgQXV0b3BsYXlpbmcsCisgICAgICAgIFBsYXlpbmcsCisgICAgICAgIFBh
dXNlZCwKKyAgICAgICAgSW50ZXJydXB0ZWQsCisgICAgfTsKICAgICBNZWRpYVNlc3Npb25TdGF0
ZSBtZWRpYVNlc3Npb25TdGF0ZShIVE1MTWVkaWFFbGVtZW50Jik7CiAKICAgICBzaXplX3QgbWVk
aWFFbGVtZW50Q291bnQoKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dvcmtl
cnMvV29ya2VyQ29uc29sZUNsaWVudC5oIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXJD
b25zb2xlQ2xpZW50LmgKaW5kZXggZTdlZDVlYzhjOGFhMWFmYjEzNTgwNGFmZjFkYTAxMTFiMjQ1
ZmNiNi4uMWQ4NDg4ZTBkMzYyODhlMDljZDU2NjJiZDdmNzcwYWRlOTVkZmVlMyAxMDA2NDQKLS0t
IGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXJDb25zb2xlQ2xpZW50LmgKKysrIGIvU291
cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXJDb25zb2xlQ2xpZW50LmgKQEAgLTMzLDYgKzMzLDgg
QEAgbmFtZXNwYWNlIEpTQyB7CiBjbGFzcyBDYWxsRnJhbWU7CiB9CiAKK3VzaW5nIEpTQzo6TWVz
c2FnZVR5cGU7CisKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogY2xhc3MgV29ya2VyQ29uc29sZUNs
aWVudCBmaW5hbCA6IHB1YmxpYyBKU0M6OkNvbnNvbGVDbGllbnQgewo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>449623</attachid>
            <date>2022-01-20 16:36:14 -0800</date>
            <delta_ts>2022-01-21 05:12:44 -0800</delta_ts>
            <desc>Updated patch with different cmake approach</desc>
            <filename>bug-226088-20220120213613.patch</filename>
            <type>text/plain</type>
            <size>9002</size>
            <attacher name="Lauro Moura">lmoura</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4MzI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw
dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBm
YWE3M2ZlYjZhYWYzMzdiMWI4MmU5NzAwYmEzNTYxNzlhMWVkYjJlLi40NTJiZjA2ZTcwMDAzODZk
YmQ3NTMyMDE5MWJiYzQ1ZDRjOTY2Y2FmIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv
cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwxMiBAQAorMjAyMi0wMS0yMCAgTGF1cm8gTW91cmEgIDxsbW91cmFAaWdhbGlhLmNvbT4K
KworICAgICAgICBbQ01ha2VdIENhbm5vdCBsaW5rIGxpYlRlc3RSdW5uZXJJbmplY3RlZEJ1bmRs
ZS5zbyBpbiBub24gdW5pZmllZCBidWlsZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y
Zy9zaG93X2J1Zy5jZ2k/aWQ9MjI2MDg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP
T1BTISkuCisKKyAgICAgICAgKiB3YXNtL2pzL0pTV2ViQXNzZW1ibHlNb2R1bGUuaDogQWRkIG1p
c3NpbmcgaGVhZGVyCisKIDIwMjItMDEtMjAgIFBhYmxvIFNhYXZlZHJhICA8cHNhYXZlZHJhQGln
YWxpYS5jb20+CiAKICAgICAgICAgTm9uLXVuaWZpZWQgYnVpbGQgZmFpbHMgZHVlIHRvIGZvcndh
cmQgZGVjbGFyYXRpb24gaW4gSmF2YVNjcmlwdENvcmUvaml0L0pJVFN0dWJSb3V0aW5lLmgKZGlm
ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwppbmRleCAzNmY3ODc5YTY4ZmExMzY5MDA3YjNlOGIwYjMzN2I1NWEzMWU4Yjg4Li4yODE1
NzE3YzA1ZTUyMTc3Zjc2OGY1NmRmYWZlNTUyOTk0ZGRlY2M0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv
V2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMg
KzEsMjYgQEAKKzIwMjItMDEtMjAgIExhdXJvIE1vdXJhICA8bG1vdXJhQGlnYWxpYS5jb20+CisK
KyAgICAgICAgW0NNYWtlXSBDYW5ub3QgbGluayBsaWJUZXN0UnVubmVySW5qZWN0ZWRCdW5kbGUu
c28gaW4gbm9uIHVuaWZpZWQgYnVpbGQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv
c2hvd19idWcuY2dpP2lkPTIyNjA4OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q
UyEpLgorCisgICAgICAgIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBp
bnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNw
ZWN0b3JDb250cm9sbGVyOjppc1VuZGVyVGVzdCBjb25zdCk6IERlZmluaW5nICBpdC4KKyAgICAg
ICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5oOiBFeHBvcnQgaXNVbmRlclRlc3Qo
KS4KKyAgICAgICAgKiBsb2FkZXIvU3VicmVzb3VyY2VJbnRlZ3JpdHkuaDogQWRkIG1pc3Npbmcg
aGVhZGVyLgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9WYWxpZGF0aW9uQnViYmxlR3RrLmNwcDog
RGl0dG8uCisgICAgICAgICogc3ZnL2dyYXBoaWNzL2ZpbHRlcnMvU1ZHRkVJbWFnZS5oOiBEaXR0
by4KKyAgICAgICAgKiB0ZXN0aW5nL0ludGVybmFscy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJ
bnRlcm5hbHM6Om1lZGlhU2Vzc2lvblN0YXRlKTogQ2FzdCBuZXcgZW51bSB0byB0aGUgV2ViQ29y
ZQorICAgICAgICBvbmUuCisgICAgICAgICogdGVzdGluZy9JbnRlcm5hbHMuaDogUmVkZWZpbmUg
TWVkaWFTZXNzaW9uU3RhdGUgYXMgYSBuZXcgZW51bQorICAgICAgICBpbnN0ZWFkIG9mIGFsaWFz
aW5nIHRvIGF2b2lkIHJlZGVmaW5pdGlvbnMgb2YKKyAgICAgICAgY29udmVydEVudW1lcmF0aW9u
VG9TdHJpbmcgaW4gbm9uLXVuaWZpZWQgYnVpbGRzLgorICAgICAgICAqIHdvcmtlcnMvV29ya2Vy
Q29uc29sZUNsaWVudC5oOgorCiAyMDIyLTAxLTIwICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNp
ZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFttYWNPU10gVmFyaW91cyB0ZXN0cyBoaXQgZGVidWcg
YXNzZXJ0aW9ucyB1bmRlciBgU2VhcmNoQnVmZmVyOjpzZWFyY2hgIGFmdGVyIHN5c3RlbSBJQ1Ug
Y2hhbmdlcwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vanMvSlNXZWJB
c3NlbWJseU1vZHVsZS5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vanMvSlNXZWJBc3Nl
bWJseU1vZHVsZS5oCmluZGV4IDA3MWU2NTY5MDg4MDUxODhjNTEwNDRlOGI5N2EyMDQ1M2Q5OGMx
NmUuLjc3ZTE5ODg3OTBkMzI3OWQyNmM0MmFlYzkyNTNiN2Q2MjEwZTcxZmYgMTAwNjQ0Ci0tLSBh
L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL2pzL0pTV2ViQXNzZW1ibHlNb2R1bGUuaAorKysg
Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9qcy9KU1dlYkFzc2VtYmx5TW9kdWxlLmgKQEAg
LTI3LDYgKzI3LDcgQEAKIAogI2lmIEVOQUJMRShXRUJBU1NFTUJMWSkKIAorI2luY2x1ZGUgIkNh
bGxMaW5rSW5mby5oIgogI2luY2x1ZGUgIkpTRGVzdHJ1Y3RpYmxlT2JqZWN0LmgiCiAjaW5jbHVk
ZSAiSlNPYmplY3QuaCIKICNpbmNsdWRlICJXYXNtTWVtb3J5TW9kZS5oIgpkaWZmIC0tZ2l0IGEv
U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwIGIvU291cmNl
L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCmluZGV4IDgzM2MwYmE4
NDRmODdiY2VkOWIyNDMwMTM4ZWM3Njc2Yzg4M2JmZmMuLjBlYTVkNzdmZTVhMzVmOGJjYWE1MWIz
NjNhNThkYjFlZTAzODYzNzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J
bnNwZWN0b3JDb250cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z
cGVjdG9yQ29udHJvbGxlci5jcHAKQEAgLTM1OSw2ICszNTksMTEgQEAgdm9pZCBJbnNwZWN0b3JD
b250cm9sbGVyOjpnZXRIaWdobGlnaHQoSW5zcGVjdG9yT3ZlcmxheTo6SGlnaGxpZ2h0JiBoaWdo
bGlnaHQsIEkKICAgICBtX292ZXJsYXktPmdldEhpZ2hsaWdodChoaWdobGlnaHQsIGNvb3JkaW5h
dGVTeXN0ZW0pOwogfQogCitib29sIEluc3BlY3RvckNvbnRyb2xsZXI6OmlzVW5kZXJUZXN0KCkg
Y29uc3QKK3sKKyAgICByZXR1cm4gbV9pc1VuZGVyVGVzdDsKK30KKwogdW5zaWduZWQgSW5zcGVj
dG9yQ29udHJvbGxlcjo6Z3JpZE92ZXJsYXlDb3VudCgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIG1f
b3ZlcmxheS0+Z3JpZE92ZXJsYXlDb3VudCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv
aW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv
ci9JbnNwZWN0b3JDb250cm9sbGVyLmgKaW5kZXggZjZmZWM3Y2ZiY2JkMmQ3ZmJhMzBiZGQzMTM4
ZTBlZGZiM2Y2OTA1NC4uN2U4NzUyZDE1NmJkMGFlYzc4N2ViMWMwNTZiZTExZjM3Y2IxNmI5ZSAx
MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIu
aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5oCkBA
IC0xMDIsNyArMTAyLDcgQEAgcHVibGljOgogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgZGlkQ29t
cG9zaXRlKEZyYW1lJik7CiAKICAgICAvLyBUZXN0aW5nIHN1cHBvcnQuCi0gICAgYm9vbCBpc1Vu
ZGVyVGVzdCgpIGNvbnN0IHsgcmV0dXJuIG1faXNVbmRlclRlc3Q7IH0KKyAgICBXRUJDT1JFX0VY
UE9SVCBib29sIGlzVW5kZXJUZXN0KCkgY29uc3Q7CiAgICAgdm9pZCBzZXRJc1VuZGVyVGVzdChi
b29sIGlzVW5kZXJUZXN0KSB7IG1faXNVbmRlclRlc3QgPSBpc1VuZGVyVGVzdDsgfQogICAgIFdF
QkNPUkVfRVhQT1JUIHZvaWQgZXZhbHVhdGVGb3JUZXN0SW5Gcm9udGVuZChjb25zdCBTdHJpbmcm
IHNjcmlwdCk7CiAgICAgV0VCQ09SRV9FWFBPUlQgdW5zaWduZWQgZ3JpZE92ZXJsYXlDb3VudCgp
IGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YnJlc291cmNlSW50
ZWdyaXR5LmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvU3VicmVzb3VyY2VJbnRlZ3JpdHkuaApp
bmRleCA5NDNjNDUxMDRmODY2Yzg0MDI2NzNmZTE5Mjg2MjJmMjI0YWQwNmYxLi45YzUwZTY1ZDdi
MzNlNzRmNTIyMDY0ODVkYzM2MTAxZjFjZDgyMmVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y
ZS9sb2FkZXIvU3VicmVzb3VyY2VJbnRlZ3JpdHkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2Fk
ZXIvU3VicmVzb3VyY2VJbnRlZ3JpdHkuaApAQCAtMjUsMTMgKzI1LDE0IEBACiAKICNwcmFnbWEg
b25jZQogCisjaW5jbHVkZSAiUmVzb3VyY2VDcnlwdG9ncmFwaGljRGlnZXN0LmgiCisKICNpbmNs
dWRlIDxvcHRpb25hbD4KICNpbmNsdWRlIDx3dGYvRm9yd2FyZC5oPgogCiBuYW1lc3BhY2UgV2Vi
Q29yZSB7CiAKIGNsYXNzIENhY2hlZFJlc291cmNlOwotc3RydWN0IEVuY29kZWRSZXNvdXJjZUNy
eXB0b2dyYXBoaWNEaWdlc3Q7CiAKIGJvb2wgbWF0Y2hJbnRlZ3JpdHlNZXRhZGF0YShjb25zdCBD
YWNoZWRSZXNvdXJjZSYsIGNvbnN0IFN0cmluZyYgaW50ZWdyaXR5TWV0YWRhdGEpOwogU3RyaW5n
IGludGVncml0eU1pc21hdGNoRGVzY3JpcHRpb24oY29uc3QgQ2FjaGVkUmVzb3VyY2UmLCBjb25z
dCBTdHJpbmcmIGludGVncml0eU1ldGFkYXRhKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl
L3BsYXRmb3JtL2d0ay9WYWxpZGF0aW9uQnViYmxlR3RrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs
YXRmb3JtL2d0ay9WYWxpZGF0aW9uQnViYmxlR3RrLmNwcAppbmRleCBmMjAwYTRhZGViNTQ0OGUx
ZjU1YWIzZDQ1OGI0YzZmZWZkZTg1Zjk4Li4xN2RhZTM1YjRiNjFhMWU0MjFjMGZiMzc2NTgxMGM2
ZjRmOTgyYThhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvVmFsaWRh
dGlvbkJ1YmJsZUd0ay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1ZhbGlk
YXRpb25CdWJibGVHdGsuY3BwCkBAIC0zMCw2ICszMCw3IEBACiAKICNpbmNsdWRlICJHdGtWZXJz
aW9uaW5nLmgiCiAjaW5jbHVkZSA8Z2xpYi5oPgorI2luY2x1ZGUgPGd0ay9ndGsuaD4KICNpbmNs
dWRlIDx3dGYvZ2xpYi9HVW5pcXVlUHRyLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5n
Lmg+CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9ncmFwaGljcy9maWx0ZXJzL1NW
R0ZFSW1hZ2UuaCBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9ncmFwaGljcy9maWx0ZXJzL1NWR0ZFSW1h
Z2UuaAppbmRleCAxZjdlODMyNjJiOWNiOTIzMGEzYTNjOWVjNTMxOWFhMTkzZGRlODE0Li5jNmQ0
YzhkZDliYWRmODYxOWQxY2RkOWVjNDI0NDA4ODFjZTFiNDQwIDEwMDY0NAotLS0gYS9Tb3VyY2Uv
V2ViQ29yZS9zdmcvZ3JhcGhpY3MvZmlsdGVycy9TVkdGRUltYWdlLmgKKysrIGIvU291cmNlL1dl
YkNvcmUvc3ZnL2dyYXBoaWNzL2ZpbHRlcnMvU1ZHRkVJbWFnZS5oCkBAIC0yNSw2ICsyNSw3IEBA
CiAKICNpbmNsdWRlICJGaWx0ZXJFZmZlY3QuaCIKICNpbmNsdWRlICJJbWFnZS5oIgorI2luY2x1
ZGUgIkltYWdlQnVmZmVyLmgiCiAjaW5jbHVkZSAiU1ZHUHJlc2VydmVBc3BlY3RSYXRpb1ZhbHVl
LmgiCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Rl
c3RpbmcvSW50ZXJuYWxzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNw
cAppbmRleCA4NWNlMjQyZGM2NTNjZmM5ZjMwNzQ3NWVjNWRjNjFlYjYwM2E2NTM0Li43ZThmM2Zh
ZTM2MTk2MjkyOWRjZDA2OTE0ZWIxOTdiMzY0OWY0OTI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi
Q29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9J
bnRlcm5hbHMuY3BwCkBAIC00NTQwLDcgKzQ1NDAsNyBAQCBSZWZQdHI8SFRNTE1lZGlhRWxlbWVu
dD4gSW50ZXJuYWxzOjpiZXN0TWVkaWFFbGVtZW50Rm9yUmVtb3RlQ29udHJvbHMoSW50ZXJuYWxz
OgogCiBJbnRlcm5hbHM6Ok1lZGlhU2Vzc2lvblN0YXRlIEludGVybmFsczo6bWVkaWFTZXNzaW9u
U3RhdGUoSFRNTE1lZGlhRWxlbWVudCYgZWxlbWVudCkKIHsKLSAgICByZXR1cm4gZWxlbWVudC5t
ZWRpYVNlc3Npb24oKS5zdGF0ZSgpOworICAgIHJldHVybiBzdGF0aWNfY2FzdDxJbnRlcm5hbHM6
Ok1lZGlhU2Vzc2lvblN0YXRlPihlbGVtZW50Lm1lZGlhU2Vzc2lvbigpLnN0YXRlKCkpOwogfQog
I2VuZGlmCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmgg
Yi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5oCmluZGV4IGExYzM5ZjdiYTRkMDFh
YTEwN2RiNWI0ZjJkYzZlYTQzMDg1YTFiMTEuLjZhMzM4OGFmYjNlMGVmOTU3YzE4NGRiM2I5YzJl
YTE0NGIxNTVhYzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxz
LmgKKysrIGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaApAQCAtMTAxMCw3ICsx
MDEwLDE1IEBAIHB1YmxpYzoKICAgICB1c2luZyBQbGF5YmFja0NvbnRyb2xzUHVycG9zZSA9IE1l
ZGlhRWxlbWVudFNlc3Npb246OlBsYXliYWNrQ29udHJvbHNQdXJwb3NlOwogICAgIFJlZlB0cjxI
VE1MTWVkaWFFbGVtZW50PiBiZXN0TWVkaWFFbGVtZW50Rm9yUmVtb3RlQ29udHJvbHMoUGxheWJh
Y2tDb250cm9sc1B1cnBvc2UpOwogCi0gICAgdXNpbmcgTWVkaWFTZXNzaW9uU3RhdGUgPSBQbGF0
Zm9ybU1lZGlhU2Vzc2lvbjo6U3RhdGU7CisgICAgLy8gU2FtZSB2YWx1ZXMgYXMgUGxhdGZvcm1N
ZWRpYVNlc3Npb246OlN0YXRlLCBidXQgcmUtZGVjbGFyZWQgdG8gYXZvaWQgcmVkZWZpbml0aW9u
cyB3aGVuIGxpbmtpbmcKKyAgICAvLyBkaXJlY3RseSB3aXRoIGxpYldlYkNvcmUgKGUuZy4gd2l0
aCBub24tdW5pZmllZCBidWlsZHMpCisgICAgZW51bSBNZWRpYVNlc3Npb25TdGF0ZSB7CisgICAg
ICAgIElkbGUsCisgICAgICAgIEF1dG9wbGF5aW5nLAorICAgICAgICBQbGF5aW5nLAorICAgICAg
ICBQYXVzZWQsCisgICAgICAgIEludGVycnVwdGVkLAorICAgIH07CiAgICAgTWVkaWFTZXNzaW9u
U3RhdGUgbWVkaWFTZXNzaW9uU3RhdGUoSFRNTE1lZGlhRWxlbWVudCYpOwogCiAgICAgc2l6ZV90
IG1lZGlhRWxlbWVudENvdW50KCkgY29uc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS93
b3JrZXJzL1dvcmtlckNvbnNvbGVDbGllbnQuaCBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29y
a2VyQ29uc29sZUNsaWVudC5oCmluZGV4IGU3ZWQ1ZWM4YzhhYTFhZmIxMzU4MDRhZmYxZGEwMTEx
YjI0NWZjYjYuLjFkODQ4OGUwZDM2Mjg4ZTA5Y2Q1NjYyYmQ3Zjc3MGFkZTk1ZGZlZTMgMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2VyQ29uc29sZUNsaWVudC5oCisrKyBi
L1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2VyQ29uc29sZUNsaWVudC5oCkBAIC0zMyw2ICsz
Myw4IEBAIG5hbWVzcGFjZSBKU0MgewogY2xhc3MgQ2FsbEZyYW1lOwogfQogCit1c2luZyBKU0M6
Ok1lc3NhZ2VUeXBlOworCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNsYXNzIFdvcmtlckNvbnNv
bGVDbGllbnQgZmluYWwgOiBwdWJsaWMgSlNDOjpDb25zb2xlQ2xpZW50IHsKZGlmZiAtLWdpdCBh
L1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAwOTBlYjljYWE5M2E2ODk4
Y2NhNTFmOTFlZGY5YjM2MzQ3ZWY2OTg4Li43M2JmOWJjNzdlMjEzZjBlYmVlNzA1NzBkMDI4NzA3
MmJiMjZkMDM4IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdl
TG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjItMDEtMjAgIExhdXJvIE1vdXJhICA8bG1vdXJhQGln
YWxpYS5jb20+CisKKyAgICAgICAgW0NNYWtlXSBDYW5ub3QgbGluayBsaWJUZXN0UnVubmVySW5q
ZWN0ZWRCdW5kbGUuc28gaW4gbm9uIHVuaWZpZWQgYnVpbGQKKyAgICAgICAgaHR0cHM6Ly9idWdz
LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNjA4OAorCisgICAgICAgIFJldmlld2VkIGJ5
IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9DTWFrZUxpc3Rz
LnR4dDogUHVsbCBXZWJDb3JlIGFzIGRlcGVuZGVuY3kgZm9yCisgICAgICAgIFdUUi9XVFJJbmpl
Y3RlZEJ1bmRsZQorCiAyMDIyLTAxLTIwICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxl
LmNvbT4KIAogICAgICAgICBbZXdzXSBMb2FkIGNyZWRlbnRpYWxzIGZyb20gcGFzc3dvcmRzLmpz
b24gaW4gbWFzdGVyLmNmZyAoRm9sbG93LXVwKQpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVz
dFJ1bm5lci9DTWFrZUxpc3RzLnR4dCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvQ01ha2VMaXN0
cy50eHQKaW5kZXggNjljMjk0YzgyOGMwMzBiNTZjMGEzZjI4ZTcyN2M0NDk3YWU5OGQ4ZC4uOWNk
Njk5NDQ0MzZhMmQyMzJiNGU0MjU2Y2U5YTYzMWJkMjAxNGUyNCAxMDA2NDQKLS0tIGEvVG9vbHMv
V2ViS2l0VGVzdFJ1bm5lci9DTWFrZUxpc3RzLnR4dAorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVu
bmVyL0NNYWtlTGlzdHMudHh0CkBAIC0yNCw2ICsyNCw3IEBAIHNldChXZWJLaXRUZXN0UnVubmVy
X0xJQlJBUklFUwogKQogc2V0KFdlYktpdFRlc3RSdW5uZXJfRlJBTUVXT1JLUwogICAgIEphdmFT
Y3JpcHRDb3JlCisgICAgV2ViQ29yZQogICAgIFdlYkNvcmVUZXN0U3VwcG9ydAogKQogCkBAIC0x
MDMsNiArMTA0LDcgQEAgbGlzdChBUFBFTkQgV2ViS2l0VGVzdFJ1bm5lckluamVjdGVkQnVuZGxl
X0lOQ0xVREVfRElSRUNUT1JJRVMKIAogc2V0KFdlYktpdFRlc3RSdW5uZXJJbmplY3RlZEJ1bmRs
ZV9MSUJSQVJJRVMKICAgICBUZXN0UnVubmVyU2hhcmVkCisgICAgV2ViS2l0OjpXZWJDb3JlCiAg
ICAgV2ViS2l0OjpXZWJDb3JlVGVzdFN1cHBvcnQKICAgICBXZWJLaXQ6OldlYktpdAogKQo=
</data>

          </attachment>
      

    </bug>

</bugzilla>