<?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>173427</bug_id>
          
          <creation_ts>2017-06-15 12:19:15 -0700</creation_ts>
          <short_desc>Add logging to MachineStackMarker to try to diagnose crashes in the wild</short_desc>
          <delta_ts>2017-06-15 13:02:48 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>New Bugs</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <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>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Keith Miller">keith_miller</reporter>
          <assigned_to name="Keith Miller">keith_miller</assigned_to>
          <cc>buildbot</cc>
    
    <cc>commit-queue</cc>
    
    <cc>keith_miller</cc>
    
    <cc>mark.lam</cc>
    
    <cc>msaboff</cc>
    
    <cc>saam</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1319654</commentid>
    <comment_count>0</comment_count>
    <who name="Keith Miller">keith_miller</who>
    <bug_when>2017-06-15 12:19:15 -0700</bug_when>
    <thetext>Add logging to MachineStackMarker to try to diagnose crashes in the wild</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1319655</commentid>
    <comment_count>1</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2017-06-15 12:20:25 -0700</bug_when>
    <thetext>&lt;rdar://problem/32797302&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1319660</commentid>
    <comment_count>2</comment_count>
      <attachid>312998</attachid>
    <who name="Keith Miller">keith_miller</who>
    <bug_when>2017-06-15 12:28:07 -0700</bug_when>
    <thetext>Created attachment 312998
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1319663</commentid>
    <comment_count>3</comment_count>
    <who name="Build Bot">buildbot</who>
    <bug_when>2017-06-15 12:30:21 -0700</bug_when>
    <thetext>Attachment 312998 did not pass style-queue:


ERROR: Source/JavaScriptCore/heap/MachineStackMarker.cpp:104:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Source/JavaScriptCore/heap/MachineStackMarker.cpp:105:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Source/JavaScriptCore/heap/MachineStackMarker.cpp:106:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Source/JavaScriptCore/heap/MachineStackMarker.cpp:107:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Source/JavaScriptCore/heap/MachineStackMarker.cpp:108:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Source/JavaScriptCore/heap/MachineStackMarker.cpp:109:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Source/JavaScriptCore/heap/MachineStackMarker.cpp:110:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Source/JavaScriptCore/heap/MachineStackMarker.cpp:111:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Source/JavaScriptCore/heap/MachineStackMarker.cpp:112:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Source/JavaScriptCore/heap/MachineStackMarker.cpp:117:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Source/JavaScriptCore/heap/MachineStackMarker.cpp:118:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Source/JavaScriptCore/heap/MachineStackMarker.cpp:119:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Source/JavaScriptCore/heap/MachineStackMarker.cpp:120:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Source/JavaScriptCore/heap/MachineStackMarker.cpp:121:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Source/JavaScriptCore/heap/MachineStackMarker.cpp:122:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Source/JavaScriptCore/heap/MachineStackMarker.cpp:123:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Source/JavaScriptCore/heap/MachineStackMarker.cpp:124:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Source/JavaScriptCore/heap/MachineStackMarker.cpp:125:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Source/JavaScriptCore/heap/MachineStackMarker.cpp:126:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Source/JavaScriptCore/heap/MachineStackMarker.cpp:127:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Source/JavaScriptCore/heap/MachineStackMarker.cpp:128:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Source/JavaScriptCore/heap/MachineStackMarker.cpp:129:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Total errors found: 22 in 2 files


If any of these errors are false positives, please file a bug against check-webkit-style.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1319665</commentid>
    <comment_count>4</comment_count>
      <attachid>312998</attachid>
    <who name="Mark Lam">mark.lam</who>
    <bug_when>2017-06-15 12:39:57 -0700</bug_when>
    <thetext>Comment on attachment 312998
Patch

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

Did you confirm that this does not conflict with registers used in the function?
Did you confirm that the callee saved registers will be restored to their original value by the C++ compiler before returning from the constructor?

r=me assuming questions and issues are addressed.

&gt; Source/JavaScriptCore/ChangeLog:10
&gt; +        not support os_log_info my hope is that if we set all the callee

please add a comma after &quot;os_log_info&quot;.

&gt; Source/JavaScriptCore/heap/MachineStackMarker.cpp:103
&gt; +    asm volatile                                  \
&gt; +    (                                             \

I suggest moving the ( after volatile.

&gt; Source/JavaScriptCore/heap/MachineStackMarker.cpp:111
&gt; +     &quot;movq $0xc0defefe000000&quot; # number &quot;, %%rbx;&quot; \
&gt; +     &quot;movq $0xc0defefe000000&quot; # number &quot;, %%r12;&quot; \
&gt; +     &quot;movq $0xc0defefe000000&quot; # number &quot;, %%r13;&quot; \
&gt; +     &quot;movq $0xc0defefe000000&quot; # number &quot;, %%r14;&quot; \
&gt; +     &quot;movq $0xc0defefe000000&quot; # number &quot;, %%r15;&quot; \
&gt; +     :                                            \
&gt; +     :                                            \
&gt; +     : &quot;%rbx&quot;, &quot;%r12&quot;, &quot;%r13&quot;, &quot;%r14&quot;, &quot;%r15&quot;     \

why indent by 5 spaces?  I suggest indenting by 3 more to make this 8.

&gt; Source/JavaScriptCore/heap/MachineStackMarker.cpp:112
&gt; +     );

I suggest changing indentation here to 4 instead of 5.

&gt; Source/JavaScriptCore/heap/MachineStackMarker.cpp:129
&gt; +    asm volatile                                  \
&gt; +    (                                             \
&gt; +     &quot;movq $0xc0defefe000000&quot; # number &quot;, %%rax;&quot; \
&gt; +     &quot;movq $0xc0defefe000000&quot; # number &quot;, %%rdi;&quot; \
&gt; +     &quot;movq $0xc0defefe000000&quot; # number &quot;, %%rsi;&quot; \
&gt; +     &quot;movq $0xc0defefe000000&quot; # number &quot;, %%rdx;&quot; \
&gt; +     &quot;movq $0xc0defefe000000&quot; # number &quot;, %%rcx;&quot; \
&gt; +     &quot;movq $0xc0defefe000000&quot; # number &quot;, %%r8;&quot;  \
&gt; +     &quot;movq $0xc0defefe000000&quot; # number &quot;, %%r9;&quot;  \
&gt; +     &quot;movq $0xc0defefe000000&quot; # number &quot;, %%r10;&quot; \
&gt; +     &quot;movq $0xc0defefe000000&quot; # number &quot;, %%r11;&quot; \
&gt; +     :                                            \
&gt; +     :                                            \
&gt; +     : &quot;%rax&quot;, &quot;%rdi&quot;, &quot;%rsi&quot;, &quot;%rdx&quot;, &quot;%rcx&quot;, &quot;%r8&quot;, &quot;%r9&quot;, &quot;%r10&quot;, &quot;%r11&quot; \
&gt; +     );

I suggest applying same changes as asm statement above.

&gt; Source/JavaScriptCore/heap/MachineStackMarker.cpp:131
&gt; +bool truth = true;

Remove.

&gt; Source/JavaScriptCore/heap/MachineStackMarker.cpp:138
&gt; +    FILL_CALLEE_SAVES_FOR_CRASH_INFO(1);

I suggest passing &quot;01&quot; instead of 1.  This way, the value you&apos;ll store is $0xc0defefe00000001 (16 digits) instead of $0xc0defefe0000001 (15 digits).

&gt; Source/JavaScriptCore/heap/MachineStackMarker.cpp:142
&gt; +    FILL_CALLEE_SAVES_FOR_CRASH_INFO(2);

Ditto.  Pass &quot;02&quot;.

&gt; Source/JavaScriptCore/heap/MachineStackMarker.cpp:146
&gt; +    if (truth)
&gt; +        CRASH();

Remove.

&gt; Source/JavaScriptCore/heap/MachineStackMarker.cpp:148
&gt; +    FILL_CALLER_SAVES_FOR_CRASH_INFO(3);

Ditto.  Pass &quot;03&quot;.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1319668</commentid>
    <comment_count>5</comment_count>
      <attachid>312998</attachid>
    <who name="Mark Lam">mark.lam</who>
    <bug_when>2017-06-15 12:54:30 -0700</bug_when>
    <thetext>Comment on attachment 312998
Patch

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

&gt; Source/JavaScriptCore/heap/MachineStackMarker.cpp:137
&gt; +#if CPU(X86_64) &amp;&amp; OS(DARWIN)

nit: I would move this #if + #endif up around the definition of FILL_CALLEE_SAVES_FOR_CRASH_INFO instead of duplicating it here for all 3 instances.  Also provide a stubbed FILL_CALLEE_SAVES_FOR_CRASH_INFO for the #else case there.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1319669</commentid>
    <comment_count>6</comment_count>
      <attachid>312998</attachid>
    <who name="Keith Miller">keith_miller</who>
    <bug_when>2017-06-15 12:57:53 -0700</bug_when>
    <thetext>Comment on attachment 312998
Patch

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

&gt;&gt; Source/JavaScriptCore/ChangeLog:10
&gt;&gt; +        not support os_log_info my hope is that if we set all the callee
&gt; 
&gt; please add a comma after &quot;os_log_info&quot;.

Fixed.

&gt;&gt; Source/JavaScriptCore/heap/MachineStackMarker.cpp:103
&gt;&gt; +    (                                             \
&gt; 
&gt; I suggest moving the ( after volatile.

Changed.

&gt;&gt; Source/JavaScriptCore/heap/MachineStackMarker.cpp:111
&gt;&gt; +     : &quot;%rbx&quot;, &quot;%r12&quot;, &quot;%r13&quot;, &quot;%r14&quot;, &quot;%r15&quot;     \
&gt; 
&gt; why indent by 5 spaces?  I suggest indenting by 3 more to make this 8.

Changed.

&gt;&gt; Source/JavaScriptCore/heap/MachineStackMarker.cpp:112
&gt;&gt; +     );
&gt; 
&gt; I suggest changing indentation here to 4 instead of 5.

Changed.

&gt;&gt; Source/JavaScriptCore/heap/MachineStackMarker.cpp:131
&gt;&gt; +bool truth = true;
&gt; 
&gt; Remove.

Whoops, I deleted this locally but I guess that didn&apos;t get updated.

&gt;&gt; Source/JavaScriptCore/heap/MachineStackMarker.cpp:137
&gt;&gt; +#if CPU(X86_64) &amp;&amp; OS(DARWIN)
&gt; 
&gt; nit: I would move this #if + #endif up around the definition of FILL_CALLEE_SAVES_FOR_CRASH_INFO instead of duplicating it here for all 3 instances.  Also provide a stubbed FILL_CALLEE_SAVES_FOR_CRASH_INFO for the #else case there.

Changed.

&gt;&gt; Source/JavaScriptCore/heap/MachineStackMarker.cpp:138
&gt;&gt; +    FILL_CALLEE_SAVES_FOR_CRASH_INFO(1);
&gt; 
&gt; I suggest passing &quot;01&quot; instead of 1.  This way, the value you&apos;ll store is $0xc0defefe00000001 (16 digits) instead of $0xc0defefe0000001 (15 digits).

Changed.

&gt;&gt; Source/JavaScriptCore/heap/MachineStackMarker.cpp:146
&gt;&gt; +        CRASH();
&gt; 
&gt; Remove.

Done.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1319670</commentid>
    <comment_count>7</comment_count>
      <attachid>313000</attachid>
    <who name="Keith Miller">keith_miller</who>
    <bug_when>2017-06-15 12:58:25 -0700</bug_when>
    <thetext>Created attachment 313000
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1319671</commentid>
    <comment_count>8</comment_count>
    <who name="Keith Miller">keith_miller</who>
    <bug_when>2017-06-15 13:02:31 -0700</bug_when>
    <thetext>Committed r218350: &lt;http://trac.webkit.org/changeset/218350&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>312998</attachid>
            <date>2017-06-15 12:28:07 -0700</date>
            <delta_ts>2017-06-15 12:58:23 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-173427-20170615122806.patch</filename>
            <type>text/plain</type>
            <size>3866</size>
            <attacher name="Keith Miller">keith_miller</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjE4Mjk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw
dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAy
OTljMzY3ODk4Njg2NzhjYTRkNDMzYjZmMmY5ZGE2MjQ2YTU3Nzg0Li4wYjBmNzExYzIxODQ3OGQw
Zjk0NWIzMDVhMWM3M2JlN2Q2ZDU1MDZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv
cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwyNSBAQAorMjAxNy0wNi0xNSAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxl
LmNvbT4KKworICAgICAgICBBZGQgbG9nZ2luZyB0byBNYWNoaW5lU3RhY2tNYXJrZXIgdG8gdHJ5
IHRvIGRpYWdub3NlIGNyYXNoZXMgaW4gdGhlIHdpbGQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MzQyNworCisgICAgICAgIFJldmlld2VkIGJ5IE5P
Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgcGF0Y2ggYWRkcyBzb21lIGxvZ2dpbmcgdG8g
dGhlIE1hY2hpbmVTdGFja01hcmtlciBjb25zdHJ1Y3RvcgorICAgICAgICB0byBoZWxwIGZpZ3Vy
ZSBvdXQgd2hlcmUgd2UgYXJlIHNlZWluZyBjcmFzaGVzLiBTaW5jZSBtYWNPUyBkb2VzCisgICAg
ICAgIG5vdCBzdXBwb3J0IG9zX2xvZ19pbmZvIG15IGhvcGUgaXMgdGhhdCBpZiB3ZSBzZXQgYWxs
IHRoZSBjYWxsZWUKKyAgICAgICAgc2F2ZSByZWdpc3RlcnMgYmVmb3JlIG1ha2luZyBhbnkgY2Fs
bHMgaW4gdGhlIEMrKyBjb2RlIHdlIGNhbgorICAgICAgICBmaWd1cmUgb3V0IHdoaWNoIGNhbGxz
IGlzIHRoZSBzb3VyY2Ugb2YgdGhlIGNyYXNoLiBXZSBhbHNvLCBzZXQKKyAgICAgICAgYWxsIHRo
ZSBjYWxsZXIgc2F2ZSByZWdpc3RlcnMgYmVmb3JlIHJldHVybmluZyBpbiBjYXNlIHNvbWUKKyAg
ICAgICAgd2VpcmRuZXNzIGlzIGhhcHBlbmluZyBpbiB0aGUgSGVhcCBjb25zdHJ1Y3Rvci4KKwor
ICAgICAgICBUaGlzIGxvZ2dpbmcgc2hvdWxkIG5vdCBtYXR0ZXIgZnJvbSBhIHBlcmZvcm1hbmNl
IHBlcnNwZWN0aXZlLiBXZQorICAgICAgICBvbmx5IGNyZWF0ZSBNYWNoaW5lU3RhY2tNYXJrZXJz
IHdoZW4gd2UgYXJlIGNyZWF0aW5nIGEgbmV3IFZNLAorICAgICAgICB3aGljaCBpcyBhbHJlYWR5
IGV4cGVuc2l2ZS4KKworICAgICAgICAqIGhlYXAvTWFjaGluZVN0YWNrTWFya2VyLmNwcDoKKyAg
ICAgICAgKEpTQzo6TWFjaGluZVRocmVhZHM6Ok1hY2hpbmVUaHJlYWRzKToKKwogMjAxNy0wNi0x
NCAgQ2xhdWRpbyBTYWF2ZWRyYSAgPGNzYWF2ZWRyYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJF
R1JFU1NJT046IDE1IG5ldyBqc2MgZmFpbHVyZXMgaW4gV1BFIGFuZCBHVEsrCmRpZmYgLS1naXQg
YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9NYWNoaW5lU3RhY2tNYXJrZXIuY3BwIGIvU291
cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvTWFjaGluZVN0YWNrTWFya2VyLmNwcAppbmRleCA1YjFl
ZTkwMWUxMmExYzE2MDBmNGE2MWRiNGZlMzQxYWYzY2RlYjMxLi4xMTJjYTFjNjc3MGE2NDEzMzg5
Yzc5MWNkOWNlOTkxZGNiYWJmYTZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv
aGVhcC9NYWNoaW5lU3RhY2tNYXJrZXIuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9o
ZWFwL01hY2hpbmVTdGFja01hcmtlci5jcHAKQEAgLTk3LDEzICs5Nyw1NiBAQCBzdGF0aWMgQWN0
aXZlTWFjaGluZVRocmVhZHNNYW5hZ2VyJiBhY3RpdmVNYWNoaW5lVGhyZWFkc01hbmFnZXIoKQog
ICAgIH0pOwogICAgIHJldHVybiAqbWFuYWdlcjsKIH0KLSAgICAKKworI2RlZmluZSBGSUxMX0NB
TExFRV9TQVZFU19GT1JfQ1JBU0hfSU5GTyhudW1iZXIpICBcCisgICAgYXNtIHZvbGF0aWxlICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKKyAgICAoICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgXAorICAgICAibW92cSAkMHhjMGRlZmVmZTAwMDAw
MCIgIyBudW1iZXIgIiwgJSVyYng7IiBcCisgICAgICJtb3ZxICQweGMwZGVmZWZlMDAwMDAwIiAj
IG51bWJlciAiLCAlJXIxMjsiIFwKKyAgICAgIm1vdnEgJDB4YzBkZWZlZmUwMDAwMDAiICMgbnVt
YmVyICIsICUlcjEzOyIgXAorICAgICAibW92cSAkMHhjMGRlZmVmZTAwMDAwMCIgIyBudW1iZXIg
IiwgJSVyMTQ7IiBcCisgICAgICJtb3ZxICQweGMwZGVmZWZlMDAwMDAwIiAjIG51bWJlciAiLCAl
JXIxNTsiIFwKKyAgICAgOiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgXAorICAgICA6ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBc
CisgICAgIDogIiVyYngiLCAiJXIxMiIsICIlcjEzIiwgIiVyMTQiLCAiJXIxNSIgICAgIFwKKyAg
ICAgKTsKKworI2RlZmluZSBGSUxMX0NBTExFUl9TQVZFU19GT1JfQ1JBU0hfSU5GTyhudW1iZXIp
ICBcCisgICAgYXNtIHZvbGF0aWxlICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwK
KyAgICAoICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAorICAg
ICAibW92cSAkMHhjMGRlZmVmZTAwMDAwMCIgIyBudW1iZXIgIiwgJSVyYXg7IiBcCisgICAgICJt
b3ZxICQweGMwZGVmZWZlMDAwMDAwIiAjIG51bWJlciAiLCAlJXJkaTsiIFwKKyAgICAgIm1vdnEg
JDB4YzBkZWZlZmUwMDAwMDAiICMgbnVtYmVyICIsICUlcnNpOyIgXAorICAgICAibW92cSAkMHhj
MGRlZmVmZTAwMDAwMCIgIyBudW1iZXIgIiwgJSVyZHg7IiBcCisgICAgICJtb3ZxICQweGMwZGVm
ZWZlMDAwMDAwIiAjIG51bWJlciAiLCAlJXJjeDsiIFwKKyAgICAgIm1vdnEgJDB4YzBkZWZlZmUw
MDAwMDAiICMgbnVtYmVyICIsICUlcjg7IiAgXAorICAgICAibW92cSAkMHhjMGRlZmVmZTAwMDAw
MCIgIyBudW1iZXIgIiwgJSVyOTsiICBcCisgICAgICJtb3ZxICQweGMwZGVmZWZlMDAwMDAwIiAj
IG51bWJlciAiLCAlJXIxMDsiIFwKKyAgICAgIm1vdnEgJDB4YzBkZWZlZmUwMDAwMDAiICMgbnVt
YmVyICIsICUlcjExOyIgXAorICAgICA6ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICBcCisgICAgIDogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgIFwKKyAgICAgOiAiJXJheCIsICIlcmRpIiwgIiVyc2kiLCAiJXJkeCIsICIlcmN4Iiwg
IiVyOCIsICIlcjkiLCAiJXIxMCIsICIlcjExIiBcCisgICAgICk7CisKK2Jvb2wgdHJ1dGggPSB0
cnVlOworCiBNYWNoaW5lVGhyZWFkczo6TWFjaGluZVRocmVhZHMoKQogICAgIDogbV9yZWdpc3Rl
cmVkVGhyZWFkcygpCiAgICAgLCBtX3RocmVhZFNwZWNpZmljRm9yTWFjaGluZVRocmVhZHMoMCkK
IHsKKyNpZiBDUFUoWDg2XzY0KSAmJiBPUyhEQVJXSU4pCisgICAgRklMTF9DQUxMRUVfU0FWRVNf
Rk9SX0NSQVNIX0lORk8oMSk7CisjZW5kaWYKICAgICB0aHJlYWRTcGVjaWZpY0tleUNyZWF0ZSgm
bV90aHJlYWRTcGVjaWZpY0Zvck1hY2hpbmVUaHJlYWRzLCByZW1vdmVUaHJlYWQpOworI2lmIENQ
VShYODZfNjQpICYmIE9TKERBUldJTikKKyAgICBGSUxMX0NBTExFRV9TQVZFU19GT1JfQ1JBU0hf
SU5GTygyKTsKKyNlbmRpZgogICAgIGFjdGl2ZU1hY2hpbmVUaHJlYWRzTWFuYWdlcigpLmFkZCh0
aGlzKTsKKyAgICBpZiAodHJ1dGgpCisgICAgICAgIENSQVNIKCk7CisjaWYgQ1BVKFg4Nl82NCkg
JiYgT1MoREFSV0lOKQorICAgIEZJTExfQ0FMTEVSX1NBVkVTX0ZPUl9DUkFTSF9JTkZPKDMpOwor
I2VuZGlmCiB9CiAKIE1hY2hpbmVUaHJlYWRzOjp+TWFjaGluZVRocmVhZHMoKQo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>313000</attachid>
            <date>2017-06-15 12:58:25 -0700</date>
            <delta_ts>2017-06-15 13:02:48 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-173427-20170615125824.patch</filename>
            <type>text/plain</type>
            <size>3778</size>
            <attacher name="Keith Miller">keith_miller</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjE4Mjk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw
dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAy
OTljMzY3ODk4Njg2NzhjYTRkNDMzYjZmMmY5ZGE2MjQ2YTU3Nzg0Li5kOWVmOGQzZWNjOTk1YjM1
ZGVmNzliOWY1ODRkOThhZjdjMzU1OWRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv
cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwyNSBAQAorMjAxNy0wNi0xNSAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxl
LmNvbT4KKworICAgICAgICBBZGQgbG9nZ2luZyB0byBNYWNoaW5lU3RhY2tNYXJrZXIgdG8gdHJ5
IHRvIGRpYWdub3NlIGNyYXNoZXMgaW4gdGhlIHdpbGQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MzQyNworCisgICAgICAgIFJldmlld2VkIGJ5IE1h
cmsgTGFtLgorCisgICAgICAgIFRoaXMgcGF0Y2ggYWRkcyBzb21lIGxvZ2dpbmcgdG8gdGhlIE1h
Y2hpbmVTdGFja01hcmtlciBjb25zdHJ1Y3RvcgorICAgICAgICB0byBoZWxwIGZpZ3VyZSBvdXQg
d2hlcmUgd2UgYXJlIHNlZWluZyBjcmFzaGVzLiBTaW5jZSBtYWNPUyBkb2VzCisgICAgICAgIG5v
dCBzdXBwb3J0IG9zX2xvZ19pbmZvIG15IGhvcGUgaXMgdGhhdCBpZiB3ZSBzZXQgYWxsIHRoZSBj
YWxsZWUKKyAgICAgICAgc2F2ZSByZWdpc3RlcnMgYmVmb3JlIG1ha2luZyBhbnkgY2FsbHMgaW4g
dGhlIEMrKyBjb2RlIHdlIGNhbgorICAgICAgICBmaWd1cmUgb3V0IHdoaWNoIGNhbGxzIGlzIHRo
ZSBzb3VyY2Ugb2YgdGhlIGNyYXNoLiBXZSBhbHNvLCBzZXQKKyAgICAgICAgYWxsIHRoZSBjYWxs
ZXIgc2F2ZSByZWdpc3RlcnMgYmVmb3JlIHJldHVybmluZyBpbiBjYXNlIHNvbWUKKyAgICAgICAg
d2VpcmRuZXNzIGlzIGhhcHBlbmluZyBpbiB0aGUgSGVhcCBjb25zdHJ1Y3Rvci4KKworICAgICAg
ICBUaGlzIGxvZ2dpbmcgc2hvdWxkIG5vdCBtYXR0ZXIgZnJvbSBhIHBlcmZvcm1hbmNlIHBlcnNw
ZWN0aXZlLiBXZQorICAgICAgICBvbmx5IGNyZWF0ZSBNYWNoaW5lU3RhY2tNYXJrZXJzIHdoZW4g
d2UgYXJlIGNyZWF0aW5nIGEgbmV3IFZNLAorICAgICAgICB3aGljaCBpcyBhbHJlYWR5IGV4cGVu
c2l2ZS4KKworICAgICAgICAqIGhlYXAvTWFjaGluZVN0YWNrTWFya2VyLmNwcDoKKyAgICAgICAg
KEpTQzo6TWFjaGluZVRocmVhZHM6Ok1hY2hpbmVUaHJlYWRzKToKKwogMjAxNy0wNi0xNCAgQ2xh
dWRpbyBTYWF2ZWRyYSAgPGNzYWF2ZWRyYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJFR1JFU1NJ
T046IDE1IG5ldyBqc2MgZmFpbHVyZXMgaW4gV1BFIGFuZCBHVEsrCmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvSmF2YVNjcmlwdENvcmUvaGVhcC9NYWNoaW5lU3RhY2tNYXJrZXIuY3BwIGIvU291cmNlL0ph
dmFTY3JpcHRDb3JlL2hlYXAvTWFjaGluZVN0YWNrTWFya2VyLmNwcAppbmRleCA1YjFlZTkwMWUx
MmExYzE2MDBmNGE2MWRiNGZlMzQxYWYzY2RlYjMxLi42NzYzZWEzYWIxYzJmNDY3OWMzNzcxYjE5
MTk3M2M1MzE2YmY1ZjQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9N
YWNoaW5lU3RhY2tNYXJrZXIuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL01h
Y2hpbmVTdGFja01hcmtlci5jcHAKQEAgLTk3LDEzICs5Nyw0OSBAQCBzdGF0aWMgQWN0aXZlTWFj
aGluZVRocmVhZHNNYW5hZ2VyJiBhY3RpdmVNYWNoaW5lVGhyZWFkc01hbmFnZXIoKQogICAgIH0p
OwogICAgIHJldHVybiAqbWFuYWdlcjsKIH0KLSAgICAKKworI2lmIENQVShYODZfNjQpICYmIE9T
KERBUldJTikKKyNkZWZpbmUgRklMTF9DQUxMRUVfU0FWRVNfRk9SX0NSQVNIX0lORk8obnVtYmVy
KSAgICAgXAorICAgIGFzbSB2b2xhdGlsZSggICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICBcCisgICAgICAgICJtb3ZxICQweGMwZGVmZWZlMDAwMDAwIiBudW1iZXIgIiwgJSVyYng7
IiBcCisgICAgICAgICJtb3ZxICQweGMwZGVmZWZlMDAwMDAwIiBudW1iZXIgIiwgJSVyMTI7IiBc
CisgICAgICAgICJtb3ZxICQweGMwZGVmZWZlMDAwMDAwIiBudW1iZXIgIiwgJSVyMTM7IiBcCisg
ICAgICAgICJtb3ZxICQweGMwZGVmZWZlMDAwMDAwIiBudW1iZXIgIiwgJSVyMTQ7IiBcCisgICAg
ICAgICJtb3ZxICQweGMwZGVmZWZlMDAwMDAwIiBudW1iZXIgIiwgJSVyMTU7IiBcCisgICAgICAg
IDogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKKyAgICAgICAg
OiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAorICAgICAgICA6
ICIlcmJ4IiwgIiVyMTIiLCAiJXIxMyIsICIlcjE0IiwgIiVyMTUiICAgICBcCisgICAgKTsKKwor
I2RlZmluZSBGSUxMX0NBTExFUl9TQVZFU19GT1JfQ1JBU0hfSU5GTyhudW1iZXIpICAgICBcCisg
ICAgYXNtIHZvbGF0aWxlKCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKKyAg
ICAgICAgIm1vdnEgJDB4YzBkZWZlZmUwMDAwMDAiIG51bWJlciAiLCAlJXJheDsiIFwKKyAgICAg
ICAgIm1vdnEgJDB4YzBkZWZlZmUwMDAwMDAiIG51bWJlciAiLCAlJXJkaTsiIFwKKyAgICAgICAg
Im1vdnEgJDB4YzBkZWZlZmUwMDAwMDAiIG51bWJlciAiLCAlJXJzaTsiIFwKKyAgICAgICAgIm1v
dnEgJDB4YzBkZWZlZmUwMDAwMDAiIG51bWJlciAiLCAlJXJkeDsiIFwKKyAgICAgICAgIm1vdnEg
JDB4YzBkZWZlZmUwMDAwMDAiIG51bWJlciAiLCAlJXJjeDsiIFwKKyAgICAgICAgIm1vdnEgJDB4
YzBkZWZlZmUwMDAwMDAiIG51bWJlciAiLCAlJXI4OyIgIFwKKyAgICAgICAgIm1vdnEgJDB4YzBk
ZWZlZmUwMDAwMDAiIG51bWJlciAiLCAlJXI5OyIgIFwKKyAgICAgICAgIm1vdnEgJDB4YzBkZWZl
ZmUwMDAwMDAiIG51bWJlciAiLCAlJXIxMDsiIFwKKyAgICAgICAgIm1vdnEgJDB4YzBkZWZlZmUw
MDAwMDAiIG51bWJlciAiLCAlJXIxMTsiIFwKKyAgICAgICAgOiAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgXAorICAgICAgICA6ICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICBcCisgICAgICAgIDogIiVyYXgiLCAiJXJkaSIsICIlcnNp
IiwgIiVyZHgiLCAiJXJjeCIsICIlcjgiLCAiJXI5IiwgIiVyMTAiLCAiJXIxMSIgXAorICAgICk7
CisjZWxzZQorI2RlZmluZSBGSUxMX0NBTExFRV9TQVZFU19GT1JfQ1JBU0hfSU5GTyhudW1iZXIp
CisjZGVmaW5lIEZJTExfQ0FMTEVSX1NBVkVTX0ZPUl9DUkFTSF9JTkZPKG51bWJlcikKKyNlbmRp
ZgorCiBNYWNoaW5lVGhyZWFkczo6TWFjaGluZVRocmVhZHMoKQogICAgIDogbV9yZWdpc3RlcmVk
VGhyZWFkcygpCiAgICAgLCBtX3RocmVhZFNwZWNpZmljRm9yTWFjaGluZVRocmVhZHMoMCkKIHsK
KyAgICBGSUxMX0NBTExFRV9TQVZFU19GT1JfQ1JBU0hfSU5GTygiMDEiKTsKICAgICB0aHJlYWRT
cGVjaWZpY0tleUNyZWF0ZSgmbV90aHJlYWRTcGVjaWZpY0Zvck1hY2hpbmVUaHJlYWRzLCByZW1v
dmVUaHJlYWQpOworICAgIEZJTExfQ0FMTEVFX1NBVkVTX0ZPUl9DUkFTSF9JTkZPKCIwMiIpOwog
ICAgIGFjdGl2ZU1hY2hpbmVUaHJlYWRzTWFuYWdlcigpLmFkZCh0aGlzKTsKKyAgICBGSUxMX0NB
TExFUl9TQVZFU19GT1JfQ1JBU0hfSU5GTygiMDMiKTsKIH0KIAogTWFjaGluZVRocmVhZHM6On5N
YWNoaW5lVGhyZWFkcygpCg==
</data>

          </attachment>
      

    </bug>

</bugzilla>