176188 2017-08-31 15:10:33 -0700 WSL EPtr does not need to carry around the type 2018-10-13 20:02:58 -0700 1 1 1 Unclassified WebKit WebGPU WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 176199 1 fpizlo fpizlo mmaxfield saam webkit-bug-importer oldest_to_newest 1344152 0 fpizlo 2017-08-31 15:10:33 -0700 Patch forthcoming. 1344153 1 319527 fpizlo 2017-08-31 15:12:13 -0700 Created attachment 319527 the patch 1344155 2 fpizlo 2017-08-31 15:17:28 -0700 Landed in https://trac.webkit.org/changeset/221448/webkit 1353616 3 webkit-bug-importer 2017-09-27 12:42:38 -0700 <rdar://problem/34693807> 1469012 4 mmaxfield 2018-10-13 20:02:58 -0700 Migrated to https://github.com/gpuweb/WHLSL/issues/206 319527 2017-08-31 15:12:13 -0700 2017-08-31 15:14:37 -0700 the patch blah.patch text/plain 13625 fpizlo SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIyMTQ0NykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDQ1IEBACisyMDE3LTA4LTMxICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisK KyAgICAgICAgV1NMIEVQdHIgZG9lcyBub3QgbmVlZCB0byBjYXJyeSBhcm91bmQgdGhlIHR5cGUK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NjE4OAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAg VG8gdmFsaWRhdGUgdGhhdCB0aGUgaW50ZXJwcmV0ZXIgaXMgbW9kZWxpbmcgYSBzdGF0aWNhbGx5 IHR5cGVkIGV4ZWN1dGlvbiBlbnZpcm9ubWVudCwgaXQncworICAgICAgICByZWFsbHkgYmVzdCBp ZiB2YWx1ZXMgZG9uJ3Qga25vdyB0aGVpciB0eXBlcyBhdCBhbGwuIEEgcG9pbnRlciBpcyBqdXN0 IGEgcG9pbnRlciAoaS5lIGEgYnVmZmVyCisgICAgICAgIGFuZCBvZmZzZXQgaW4gb3VyIHdvcmxk KSwgYW5kIGl0J3MgdGhlIGpvYiBvZiB0aGUgQVNUIG5vZGUgdGhhdCB1c2VzIGl0IHRvIGZpZ3Vy ZSBvdXQgd2hhdCBpdHMKKyAgICAgICAgdHlwZSBzaG91bGQgYmUuCisgICAgICAgIAorICAgICAg ICBJIHRoaW5rIHRoaXMgbWFrZXMgdGhlIGNvZGUgc2ltcGxlciBvdmVyYWxsLgorCisgICAgICAg ICogV2ViR1BVU2hhZGluZ0xhbmd1YWdlUkkvQWxsLmpzOgorICAgICAgICAqIFdlYkdQVVNoYWRp bmdMYW5ndWFnZVJJL0NhbGxGdW5jdGlvbi5qczoKKyAgICAgICAgKGNhbGxGdW5jdGlvbkJ5UmVm KToKKyAgICAgICAgKGNhbGxGdW5jdGlvbik6CisgICAgICAgICogV2ViR1BVU2hhZGluZ0xhbmd1 YWdlUkkvQ2hlY2tlci5qczoKKyAgICAgICAgKENoZWNrZXIucHJvdG90eXBlLnZpc2l0UHJvdG9j b2xEZWNsLnNldCB0aHJvdyk6CisgICAgICAgICogV2ViR1BVU2hhZGluZ0xhbmd1YWdlUkkvRUJ1 ZmZlckJ1aWxkZXIuanM6CisgICAgICAgIChFQnVmZmVyQnVpbGRlci5wcm90b3R5cGUuX2NyZWF0 ZUVQdHIpOgorICAgICAgICAqIFdlYkdQVVNoYWRpbmdMYW5ndWFnZVJJL0VQdHIuanM6CisgICAg ICAgIChFUHRyKToKKyAgICAgICAgKEVQdHIuYm94KToKKyAgICAgICAgKEVQdHIucHJvdG90eXBl LmNvcHlGcm9tKToKKyAgICAgICAgKEVQdHIucHJvdG90eXBlLnRvU3RyaW5nKToKKyAgICAgICAg KiBXZWJHUFVTaGFkaW5nTGFuZ3VhZ2VSSS9FVmFsdWUuanM6IFJlbW92ZWQuCisgICAgICAgICog V2ViR1BVU2hhZGluZ0xhbmd1YWdlUkkvRXZhbHVhdG9yLmpzOgorICAgICAgICAoRXZhbHVhdG9y LnByb3RvdHlwZS52aXNpdEZ1bmN0aW9uTGlrZUJsb2NrKToKKyAgICAgICAgKEV2YWx1YXRvci5w cm90b3R5cGUudmlzaXRWYXJpYWJsZURlY2wpOgorICAgICAgICAoRXZhbHVhdG9yLnByb3RvdHlw ZS52aXNpdEFzc2lnbm1lbnQpOgorICAgICAgICAoRXZhbHVhdG9yLnByb3RvdHlwZS52aXNpdElu dExpdGVyYWwpOgorICAgICAgICAqIFdlYkdQVVNoYWRpbmdMYW5ndWFnZVJJL0ludHJpbnNpY3Mu anM6CisgICAgICAgIChJbnRyaW5zaWNzKToKKyAgICAgICAgKiBXZWJHUFVTaGFkaW5nTGFuZ3Vh Z2VSSS9SZXdyaXRlci5qczoKKyAgICAgICAgKFJld3JpdGVyLnByb3RvdHlwZS52aXNpdEFzc2ln bm1lbnQpOgorICAgICAgICAqIFdlYkdQVVNoYWRpbmdMYW5ndWFnZVJJL1N0cnVjdFR5cGUuanM6 CisgICAgICAgIChTdHJ1Y3RUeXBlLnByb3RvdHlwZS5pbnN0YW50aWF0ZSk6CisgICAgICAgICog V2ViR1BVU2hhZGluZ0xhbmd1YWdlUkkvVGVzdC5qczoKKyAgICAgICAgKGNoZWNrSW50KToKKwog MjAxNy0wOC0zMSAgRmlsaXAgUGl6bG8gIDxmcGl6bG9AYXBwbGUuY29tPgogCiAgICAgICAgIFdT TCBkb2Vzbid0IG5lZWQgdG8gd3JhcCBwcmltaXRpdmVzIGxpa2UgaW50cyBhbmQgZmxvYXRzIGlu IHNwZWNpYWxpemVkIGNsYXNzZXMgbGlrZSBFSW50IGFuZCBFRmxvYXQKSW5kZXg6IFRvb2xzL1dl YkdQVVNoYWRpbmdMYW5ndWFnZVJJL0FsbC5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9XZWJHUFVT aGFkaW5nTGFuZ3VhZ2VSSS9BbGwuanMJKHJldmlzaW9uIDIyMTQ0NikKKysrIFRvb2xzL1dlYkdQ VVNoYWRpbmdMYW5ndWFnZVJJL0FsbC5qcwkod29ya2luZyBjb3B5KQpAQCAtMzEsNyArMzEsNiBA QCBsb2FkKCJWYWx1ZS5qcyIpOwogbG9hZCgiRXhwcmVzc2lvbi5qcyIpOwogbG9hZCgiUmV3cml0 ZXIuanMiKTsKIGxvYWQoIlZpc2l0b3IuanMiKTsKLWxvYWQoIkVWYWx1ZS5qcyIpOwogCiBsb2Fk KCJBZGRyZXNzU3BhY2UuanMiKTsKIGxvYWQoIkFycmF5UmVmVHlwZS5qcyIpOwpJbmRleDogVG9v bHMvV2ViR1BVU2hhZGluZ0xhbmd1YWdlUkkvQ2FsbEZ1bmN0aW9uLmpzCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFRvb2xzL1dlYkdQVVNoYWRpbmdMYW5ndWFnZVJJL0NhbGxGdW5jdGlvbi5qcwkocmV2aXNpb24g MjIxNDQ2KQorKysgVG9vbHMvV2ViR1BVU2hhZGluZ0xhbmd1YWdlUkkvQ2FsbEZ1bmN0aW9uLmpz CSh3b3JraW5nIGNvcHkpCkBAIC0yNywxOCArMjcsMTQgQEAKIC8vIFRoaXMgYWxsb3dzIHlvdSB0 byBwYXNzIHN0cnVjdHMgYW5kIGFycmF5cyBpbi1wbGFjZSwgYnV0IGl0J3MgYSBtb3JlIGFubm95 aW5nIEFQSS4KIGZ1bmN0aW9uIGNhbGxGdW5jdGlvbkJ5UmVmKHByb2dyYW0sIG5hbWUsIHR5cGVB cmd1bWVudHMsIGFyZ3VtZW50TGlzdCkKIHsKLSAgICBsZXQgYXJndW1lbnRUeXBlcyA9IGFyZ3Vt ZW50TGlzdC5tYXAoYXJndW1lbnQgPT4gewotICAgICAgICBsZXQgcmVzdWx0ID0gYXJndW1lbnQu dHlwZS5lbGVtZW50VHlwZTsKLSAgICAgICAgaWYgKCFyZXN1bHQpCi0gICAgICAgICAgICB0aHJv dyBuZXcgRXJyb3IoIkFyZ3VtZW50IGhhcyBubyBlbGVtZW50IHR5cGU6ICIgKyBhcmd1bWVudCk7 Ci0gICAgICAgIHJldHVybiByZXN1bHQ7Ci0gICAgfSk7CisgICAgbGV0IGFyZ3VtZW50VHlwZXMg PSBhcmd1bWVudExpc3QubWFwKGFyZ3VtZW50ID0+IGFyZ3VtZW50LnR5cGUpOwogICAgIGxldCBm dW5jID0gcmVzb2x2ZUlubGluZWRGdW5jdGlvbihwcm9ncmFtLCBuYW1lLCB0eXBlQXJndW1lbnRz LCBhcmd1bWVudFR5cGVzKTsKICAgICBpZiAoIWZ1bmMpCiAgICAgICAgIHRocm93IG5ldyBXVHlw ZUVycm9yKCI8Y2FsbEZ1bmN0aW9uPiIsICJDYW5ub3QgcmVzb2x2ZSBmdW5jdGlvbiBjYWxsICIg KyBuYW1lICsgIjwiICsgdHlwZUFyZ3VtZW50cyArICI+KCIgKyBhcmd1bWVudExpc3QgKyAiKSIp OwogICAgIGZvciAobGV0IGkgPSAwOyBpIDwgZnVuYy5wYXJhbWV0ZXJzLmxlbmd0aDsgKytpKQot ICAgICAgICBmdW5jLnBhcmFtZXRlcnNbaV0uZVB0ci5jb3B5RnJvbShhcmd1bWVudExpc3RbaV0p OwotICAgIHJldHVybiBuZXcgRXZhbHVhdG9yKHByb2dyYW0pLnZpc2l0RnVuY3Rpb25Cb2R5KGZ1 bmMuYm9keSk7CisgICAgICAgIGZ1bmMucGFyYW1ldGVyc1tpXS5lUHRyLmNvcHlGcm9tKGFyZ3Vt ZW50TGlzdFtpXS52YWx1ZSwgYXJndW1lbnRUeXBlc1tpXS5zaXplKTsKKyAgICBsZXQgcmVzdWx0 ID0gbmV3IEV2YWx1YXRvcihwcm9ncmFtKS52aXNpdEZ1bmN0aW9uQm9keShmdW5jLmJvZHkpOwor ICAgIHJldHVybiBuZXcgVHlwZWRWYWx1ZShmdW5jLnJldHVyblR5cGUsIHJlc3VsdCk7CiB9CiAK IC8vIFRoaXMgdXNlcyB0aGUgc2ltcGxpZmllZCBUeXBlZFZhbHVlIG9iamVjdCBmb3Igd3JhcHBp bmcgdmFsdWVzIGxpa2UgaW50ZWdlcnMgYW5kIGRvdWJsZXMuCkBAIC00Niw2ICs0Miw2IEBAIGZ1 bmN0aW9uIGNhbGxGdW5jdGlvbihwcm9ncmFtLCBuYW1lLCB0eXAKIHsKICAgICBsZXQgcmVzdWx0 ID0gY2FsbEZ1bmN0aW9uQnlSZWYoCiAgICAgICAgIHByb2dyYW0sIG5hbWUsIHR5cGVBcmd1bWVu dHMsCi0gICAgICAgIGFyZ3VtZW50TGlzdC5tYXAoYXJndW1lbnQgPT4gRVB0ci5ib3goYXJndW1l bnQudHlwZSwgYXJndW1lbnQudmFsdWUpKSk7Ci0gICAgcmV0dXJuIG5ldyBUeXBlZFZhbHVlKHJl c3VsdC50eXBlLmVsZW1lbnRUeXBlLCByZXN1bHQubG9hZFZhbHVlKCkpOworICAgICAgICBhcmd1 bWVudExpc3QubWFwKGFyZ3VtZW50ID0+IG5ldyBUeXBlZFZhbHVlKGFyZ3VtZW50LnR5cGUsIEVQ dHIuYm94KGFyZ3VtZW50LnZhbHVlKSkpKTsKKyAgICByZXR1cm4gbmV3IFR5cGVkVmFsdWUocmVz dWx0LnR5cGUsIHJlc3VsdC52YWx1ZS5sb2FkVmFsdWUoKSk7CiB9CkluZGV4OiBUb29scy9XZWJH UFVTaGFkaW5nTGFuZ3VhZ2VSSS9DaGVja2VyLmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1dlYkdQ VVNoYWRpbmdMYW5ndWFnZVJJL0NoZWNrZXIuanMJKHJldmlzaW9uIDIyMTQ0MikKKysrIFRvb2xz L1dlYkdQVVNoYWRpbmdMYW5ndWFnZVJJL0NoZWNrZXIuanMJKHdvcmtpbmcgY29weSkKQEAgLTEy OCw2ICsxMjgsNyBAQCBjbGFzcyBDaGVja2VyIGV4dGVuZHMgVmlzaXRvciB7CiAgICAgICAgIGxl dCByaHNUeXBlID0gbm9kZS5yaHMudmlzaXQodGhpcyk7CiAgICAgICAgIGlmICghbGhzVHlwZS5l cXVhbHMocmhzVHlwZSkpCiAgICAgICAgICAgICB0aHJvdyBuZXcgV1R5cGVFcnJvcihub2RlLm9y aWdpbi5vcmlnaW5TdHJpbmcsICJUeXBlIG1pc21hdGNoIGluIGFzc2lnbm1lbnQ6ICIgKyBsaHNU eXBlICsgIiB2ZXJzdXMgIiArIHJoc1R5cGUpOworICAgICAgICBub2RlLnR5cGUgPSBsaHNUeXBl OwogICAgICAgICByZXR1cm4gbGhzVHlwZTsKICAgICB9CiAgICAgCkluZGV4OiBUb29scy9XZWJH UFVTaGFkaW5nTGFuZ3VhZ2VSSS9FQnVmZmVyQnVpbGRlci5qcwo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29s cy9XZWJHUFVTaGFkaW5nTGFuZ3VhZ2VSSS9FQnVmZmVyQnVpbGRlci5qcwkocmV2aXNpb24gMjIx NDQyKQorKysgVG9vbHMvV2ViR1BVU2hhZGluZ0xhbmd1YWdlUkkvRUJ1ZmZlckJ1aWxkZXIuanMJ KHdvcmtpbmcgY29weSkKQEAgLTM2LDcgKzM2LDcgQEAgY2xhc3MgRUJ1ZmZlckJ1aWxkZXIgZXh0 ZW5kcyBWaXNpdG9yIHsKICAgICAgICAgdHlwZSA9IHR5cGUuaW5zdGFudGlhdGVkVHlwZTsKICAg ICAgICAgbGV0IGJ1ZmZlciA9IG5ldyBFQnVmZmVyKHR5cGUuc2l6ZSk7CiAgICAgICAgIHR5cGUu cG9wdWxhdGVEZWZhdWx0VmFsdWUoYnVmZmVyLCAwKTsKLSAgICAgICAgcmV0dXJuIG5ldyBFUHRy KG5ldyBQdHJUeXBlKG51bGwsICJ0aHJlYWQiLCB0eXBlKSwgYnVmZmVyLCAwKTsKKyAgICAgICAg cmV0dXJuIG5ldyBFUHRyKGJ1ZmZlciwgMCk7CiAgICAgfQogICAgIAogICAgIF9jcmVhdGVFUHRy Rm9yTm9kZShub2RlKQpJbmRleDogVG9vbHMvV2ViR1BVU2hhZGluZ0xhbmd1YWdlUkkvRVB0ci5q cwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBUb29scy9XZWJHUFVTaGFkaW5nTGFuZ3VhZ2VSSS9FUHRyLmpzCShy ZXZpc2lvbiAyMjE0NDYpCisrKyBUb29scy9XZWJHUFVTaGFkaW5nTGFuZ3VhZ2VSSS9FUHRyLmpz CSh3b3JraW5nIGNvcHkpCkBAIC0yNCwxMiArMjQsOSBAQAogICovCiAidXNlIHN0cmljdCI7CiAK LWNsYXNzIEVQdHIgZXh0ZW5kcyBFVmFsdWUgewotICAgIGNvbnN0cnVjdG9yKHR5cGUsIGJ1ZmZl ciwgb2Zmc2V0KQorY2xhc3MgRVB0ciB7CisgICAgY29uc3RydWN0b3IoYnVmZmVyLCBvZmZzZXQp CiAgICAgewotICAgICAgICBzdXBlcih0eXBlKTsKLSAgICAgICAgaWYgKCEodHlwZS51bmlmeU5v ZGUgaW5zdGFuY2VvZiBQdHJUeXBlKSkKLSAgICAgICAgICAgIHRocm93IG5ldyBFcnJvcigiQ2Fu bm90IGNyZWF0ZSBFUHRyIHdpdGggbm9uLXB0ciB0eXBlOiAiICsgdHlwZSk7CiAgICAgICAgIHRo aXMuX2J1ZmZlciA9IGJ1ZmZlcjsKICAgICAgICAgdGhpcy5fb2Zmc2V0ID0gb2Zmc2V0OwogICAg IH0KQEAgLTM5LDEzICszNiwxMSBAQCBjbGFzcyBFUHRyIGV4dGVuZHMgRVZhbHVlIHsKICAgICAv LyBmdW5jdGlvbiBpcyBoZXJlIHRvIGhlbHAuCiAgICAgLy8KICAgICAvLyBJbiBhIHJlYWwgZXhl Y3V0aW9uIGVudmlyb25tZW50LCB1c2VzIG9mIHRoaXMgbWFuaWZlc3QgYXMgU1NBIHRlbXBvcmFy aWVzLgotICAgIHN0YXRpYyBib3godHlwZSwgdmFsdWUpCisgICAgc3RhdGljIGJveCh2YWx1ZSkK ICAgICB7Ci0gICAgICAgIGlmICghdHlwZSB8fCAhdmFsdWUpCi0gICAgICAgICAgICB0aHJvdyBu ZXcgRXJyb3IoIk5lZWQgYm90aCB0eXBlIGFuZCB2YWx1ZSIpOwogICAgICAgICBsZXQgYnVmZmVy ID0gbmV3IEVCdWZmZXIoMSk7CiAgICAgICAgIGJ1ZmZlci5zZXQoMCwgdmFsdWUpOwotICAgICAg ICByZXR1cm4gbmV3IEVQdHIobmV3IFB0clR5cGUobnVsbCwgInRocmVhZCIsIHR5cGUpLCBidWZm ZXIsIDApOworICAgICAgICByZXR1cm4gbmV3IEVQdHIoYnVmZmVyLCAwKTsKICAgICB9CiAgICAg CiAgICAgZ2V0IGJ1ZmZlcigpIHsgcmV0dXJuIHRoaXMuX2J1ZmZlcjsgfQpAQCAtNTYsMTIgKzUx LDkgQEAgY2xhc3MgRVB0ciBleHRlbmRzIEVWYWx1ZSB7CiAgICAgICAgIHJldHVybiB0aGlzLmJ1 ZmZlci5nZXQodGhpcy5vZmZzZXQpOwogICAgIH0KICAgICAKLSAgICBjb3B5RnJvbShvdGhlcikK KyAgICBjb3B5RnJvbShvdGhlciwgc2l6ZSkKICAgICB7Ci0gICAgICAgIGxldCBlbGVtZW50VHlw ZSA9IHRoaXMudHlwZS5lbGVtZW50VHlwZTsKLSAgICAgICAgaWYgKCFlbGVtZW50VHlwZSkKLSAg ICAgICAgICAgIHRocm93IG5ldyBFcnJvcigiTm8gZWxlbWVudCB0eXBlOiAiICsgdGhpcyk7Ci0g ICAgICAgIGZvciAobGV0IGkgPSBlbGVtZW50VHlwZS5zaXplOyBpLS07KQorICAgICAgICBmb3Ig KGxldCBpID0gc2l6ZTsgaS0tOykKICAgICAgICAgICAgIHRoaXMuYnVmZmVyLnNldChpLCBvdGhl ci5idWZmZXIuZ2V0KGkpKTsKICAgICB9CiAgICAgCkBAIC02OSw3ICs2MSw3IEBAIGNsYXNzIEVQ dHIgZXh0ZW5kcyBFVmFsdWUgewogICAgIHsKICAgICAgICAgaWYgKCF0aGlzLmJ1ZmZlcikKICAg ICAgICAgICAgIHJldHVybiAibnVsbCI7Ci0gICAgICAgIHJldHVybiB0aGlzLnR5cGUgKyAiQiIg KyB0aGlzLmJ1ZmZlci5pbmRleCArICI6IiArIHRoaXMub2Zmc2V0OworICAgICAgICByZXR1cm4g IkIiICsgdGhpcy5idWZmZXIuaW5kZXggKyAiOiIgKyB0aGlzLm9mZnNldDsKICAgICB9CiB9CiAK SW5kZXg6IFRvb2xzL1dlYkdQVVNoYWRpbmdMYW5ndWFnZVJJL0VWYWx1ZS5qcwo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBUb29scy9XZWJHUFVTaGFkaW5nTGFuZ3VhZ2VSSS9FVmFsdWUuanMJKHJldmlzaW9uIDIy MTQzNSkKKysrIFRvb2xzL1dlYkdQVVNoYWRpbmdMYW5ndWFnZVJJL0VWYWx1ZS5qcwkobm9uZXhp c3RlbnQpCkBAIC0xLDM3ICswLDAgQEAKLS8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTcgQXBwbGUg SW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgotICoKLSAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2Ug aW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAotICogbW9kaWZpY2F0 aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25z Ci0gKiBhcmUgbWV0OgotICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3Qg cmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKLSAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNv bmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KLSAqIDIuIFJlZGlzdHJpYnV0 aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0Ci0g KiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRp c2NsYWltZXIgaW4gdGhlCi0gKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlh bHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgotICoKLSAqIFRISVMgU09GVFdBUkUg SVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBgYEFTIElTJycgQU5EIEFOWQotICogRVhQUkVTUyBP UiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBUSEUK LSAqIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9S IEEgUEFSVElDVUxBUgotICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gIElOIE5PIEVWRU5UIFNI QUxMIEFQUExFIElOQy4gT1IKLSAqIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJF Q1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLAotICogRVhFTVBMQVJZLCBPUiBDT05T RVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAotICogUFJP Q1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERB VEEsIE9SCi0gKiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FV U0VEIEFORCBPTiBBTlkgVEhFT1JZCi0gKiBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJB Q1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKLSAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBP UiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQotICogT0YgVEhJ UyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERB TUFHRS4gCi0gKi8KLSJ1c2Ugc3RyaWN0IjsKLQotY2xhc3MgRVZhbHVlIHsKLSAgICBjb25zdHJ1 Y3Rvcih0eXBlKQotICAgIHsKLSAgICAgICAgaWYgKCF0eXBlKQotICAgICAgICAgICAgdGhyb3cg bmV3IEVycm9yKCJObyB0eXBlIik7Ci0gICAgICAgIHRoaXMuX3R5cGUgPSB0eXBlLnVuaWZ5Tm9k ZTsKLSAgICB9Ci0gICAgCi0gICAgZ2V0IHR5cGUoKSB7IHJldHVybiB0aGlzLl90eXBlOyB9Ci19 Ci0KSW5kZXg6IFRvb2xzL1dlYkdQVVNoYWRpbmdMYW5ndWFnZVJJL0V2YWx1YXRvci5qcwo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBUb29scy9XZWJHUFVTaGFkaW5nTGFuZ3VhZ2VSSS9FdmFsdWF0b3IuanMJKHJl dmlzaW9uIDIyMTQ0NikKKysrIFRvb2xzL1dlYkdQVVNoYWRpbmdMYW5ndWFnZVJJL0V2YWx1YXRv ci5qcwkod29ya2luZyBjb3B5KQpAQCAtNTAsOCArNTAsMTEgQEAgY2xhc3MgRXZhbHVhdG9yIGV4 dGVuZHMgVmlzaXRvciB7CiAgICAgCiAgICAgdmlzaXRGdW5jdGlvbkxpa2VCbG9jayhub2RlKQog ICAgIHsKLSAgICAgICAgZm9yIChsZXQgaSA9IDA7IGkgPCBub2RlLmFyZ3VtZW50TGlzdC5sZW5n dGg7ICsraSkKLSAgICAgICAgICAgIG5vZGUucGFyYW1ldGVyc1tpXS5lUHRyLmNvcHlGcm9tKG5v ZGUuYXJndW1lbnRMaXN0W2ldLnZpc2l0KHRoaXMpKTsKKyAgICAgICAgZm9yIChsZXQgaSA9IDA7 IGkgPCBub2RlLmFyZ3VtZW50TGlzdC5sZW5ndGg7ICsraSkgeworICAgICAgICAgICAgbm9kZS5w YXJhbWV0ZXJzW2ldLmVQdHIuY29weUZyb20oCisgICAgICAgICAgICAgICAgbm9kZS5hcmd1bWVu dExpc3RbaV0udmlzaXQodGhpcyksCisgICAgICAgICAgICAgICAgbm9kZS5wYXJhbWV0ZXJzW2ld LnR5cGUuc2l6ZSk7CisgICAgICAgIH0KICAgICAgICAgcmV0dXJuIHRoaXMudmlzaXRGdW5jdGlv bkJvZHkobm9kZS5ib2R5KTsKICAgICB9CiAgICAgCkBAIC02MiwxNSArNjUsMTcgQEAgY2xhc3Mg RXZhbHVhdG9yIGV4dGVuZHMgVmlzaXRvciB7CiAgICAgCiAgICAgdmlzaXRWYXJpYWJsZURlY2wo bm9kZSkKICAgICB7CisgICAgICAgIGlmICghbm9kZS5lUHRyLmJ1ZmZlcikKKyAgICAgICAgICAg IHRocm93IG5ldyBFcnJvcigiZXB0ciB3aXRob3V0IGJ1ZmZlciBpbiAiICsgbm9kZSk7CiAgICAg ICAgIG5vZGUudHlwZS5wb3B1bGF0ZURlZmF1bHRWYWx1ZShub2RlLmVQdHIuYnVmZmVyLCBub2Rl LmVQdHIub2Zmc2V0KTsKICAgICAgICAgaWYgKG5vZGUuaW5pdGlhbGl6ZXIpCi0gICAgICAgICAg ICBub2RlLmVQdHIuY29weUZyb20obm9kZS5pbml0aWFsaXplci52aXNpdCh0aGlzKSk7CisgICAg ICAgICAgICBub2RlLmVQdHIuY29weUZyb20obm9kZS5pbml0aWFsaXplci52aXNpdCh0aGlzKSwg bm9kZS50eXBlLnNpemUpOwogICAgIH0KICAgICAKICAgICB2aXNpdEFzc2lnbm1lbnQobm9kZSkK ICAgICB7CiAgICAgICAgIGxldCByZXN1bHQgPSBub2RlLmxocy52aXNpdCh0aGlzKTsKLSAgICAg ICAgcmVzdWx0LmNvcHlGcm9tKG5vZGUucmhzLnZpc2l0KHRoaXMpKTsKKyAgICAgICAgcmVzdWx0 LmNvcHlGcm9tKG5vZGUucmhzLnZpc2l0KHRoaXMpLCBub2RlLnR5cGUuc2l6ZSk7CiAgICAgICAg IHJldHVybiByZXN1bHQ7CiAgICAgfQogICAgIApAQCAtODksNyArOTQsNyBAQCBjbGFzcyBFdmFs dWF0b3IgZXh0ZW5kcyBWaXNpdG9yIHsKICAgICAKICAgICB2aXNpdEludExpdGVyYWwobm9kZSkK ICAgICB7Ci0gICAgICAgIHJldHVybiBFUHRyLmJveCh0aGlzLl9wcm9ncmFtLmludHJpbnNpY3Mu aW50MzIsIG5vZGUudmFsdWUpOworICAgICAgICByZXR1cm4gRVB0ci5ib3gobm9kZS52YWx1ZSk7 CiAgICAgfQogICAgIAogICAgIHZpc2l0Q2FsbEV4cHJlc3Npb24obm9kZSkKSW5kZXg6IFRvb2xz L1dlYkdQVVNoYWRpbmdMYW5ndWFnZVJJL0ludHJpbnNpY3MuanMKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v bHMvV2ViR1BVU2hhZGluZ0xhbmd1YWdlUkkvSW50cmluc2ljcy5qcwkocmV2aXNpb24gMjIxNDQ2 KQorKysgVG9vbHMvV2ViR1BVU2hhZGluZ0xhbmd1YWdlUkkvSW50cmluc2ljcy5qcwkod29ya2lu ZyBjb3B5KQpAQCAtNjIsNyArNjIsNyBAQCBjbGFzcyBJbnRyaW5zaWNzIHsKICAgICAgICAgICAg ICJuYXRpdmUgaW50IG9wZXJhdG9yKzw+KGludCxpbnQpIiwKICAgICAgICAgICAgIChmdW5jKSA9 PiB7CiAgICAgICAgICAgICAgICAgZnVuYy5pbXBsZW1lbnRhdGlvbiA9Ci0gICAgICAgICAgICAg ICAgICAgIChbbGVmdCwgcmlnaHRdKSA9PiBFUHRyLmJveCh0aGlzLmludDMyLCAobGVmdC5sb2Fk VmFsdWUoKSArIHJpZ2h0LmxvYWRWYWx1ZSgpKSB8IDApOworICAgICAgICAgICAgICAgICAgICAo W2xlZnQsIHJpZ2h0XSkgPT4gRVB0ci5ib3goKGxlZnQubG9hZFZhbHVlKCkgKyByaWdodC5sb2Fk VmFsdWUoKSkgfCAwKTsKICAgICAgICAgICAgIH0pOwogICAgIH0KICAgICAKSW5kZXg6IFRvb2xz L1dlYkdQVVNoYWRpbmdMYW5ndWFnZVJJL1Jld3JpdGVyLmpzCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L1dlYkdQVVNoYWRpbmdMYW5ndWFnZVJJL1Jld3JpdGVyLmpzCShyZXZpc2lvbiAyMjE0NDIpCisr KyBUb29scy9XZWJHUFVTaGFkaW5nTGFuZ3VhZ2VSSS9SZXdyaXRlci5qcwkod29ya2luZyBjb3B5 KQpAQCAtMTM4LDcgKzEzOCw5IEBAIGNsYXNzIFJld3JpdGVyIHsKICAgICAKICAgICB2aXNpdEFz c2lnbm1lbnQobm9kZSkKICAgICB7Ci0gICAgICAgIHJldHVybiBuZXcgQXNzaWdubWVudChub2Rl Lm9yaWdpbiwgbm9kZS5saHMudmlzaXQodGhpcyksIG5vZGUucmhzLnZpc2l0KHRoaXMpKTsKKyAg ICAgICAgbGV0IHJlc3VsdCA9IG5ldyBBc3NpZ25tZW50KG5vZGUub3JpZ2luLCBub2RlLmxocy52 aXNpdCh0aGlzKSwgbm9kZS5yaHMudmlzaXQodGhpcykpOworICAgICAgICByZXN1bHQudHlwZSA9 IG5vZGUudHlwZS52aXNpdCh0aGlzKTsKKyAgICAgICAgcmV0dXJuIHJlc3VsdDsKICAgICB9CiAg ICAgCiAgICAgdmlzaXRWYXJpYWJsZVJlZihub2RlKQpJbmRleDogVG9vbHMvV2ViR1BVU2hhZGlu Z0xhbmd1YWdlUkkvU3RydWN0VHlwZS5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9XZWJHUFVTaGFk aW5nTGFuZ3VhZ2VSSS9TdHJ1Y3RUeXBlLmpzCShyZXZpc2lvbiAyMjE0MzUpCisrKyBUb29scy9X ZWJHUFVTaGFkaW5nTGFuZ3VhZ2VSSS9TdHJ1Y3RUeXBlLmpzCSh3b3JraW5nIGNvcHkpCkBAIC02 MSw2ICs2MSw5IEBAIGNsYXNzIFN0cnVjdFR5cGUgZXh0ZW5kcyBUeXBlIHsKICAgICAgICAgaWYg KHR5cGVBcmd1bWVudHMubGVuZ3RoICE9IHRoaXMudHlwZVBhcmFtZXRlcnMubGVuZ3RoKQogICAg ICAgICAgICAgdGhyb3cgbmV3IFdUeXBlRXJyb3Iob3JpZ2luLm9yaWdpblN0cmluZywgIldyb25n IG51bWJlciBvZiB0eXBlIGFyZ3VtZW50cyB0byBpbnN0YW50aWF0aW9uIik7CiAgICAgICAgIAor ICAgICAgICBpZiAoIXR5cGVBcmd1bWVudHMubGVuZ3RoKQorICAgICAgICAgICAgcmV0dXJuIHRo aXM7CisgICAgICAgIAogICAgICAgICBsZXQgc3Vic3RpdHV0aW9uID0gU3Vic3RpdHV0aW9uLm1h cHBpbmcodGhpcy50eXBlUGFyYW1ldGVycywgdHlwZUFyZ3VtZW50cyk7CiAgICAgICAgIGxldCBp bnN0YW50aWF0ZUltbWVkaWF0ZXMgPSBuZXcgSW5zdGFudGlhdGVJbW1lZGlhdGVzKCk7CiAgICAg ICAgIGxldCByZXN1bHQgPSBuZXcgU3RydWN0VHlwZSh0aGlzLm9yaWdpbiwgdGhpcy5uYW1lLCBb XSk7CkluZGV4OiBUb29scy9XZWJHUFVTaGFkaW5nTGFuZ3VhZ2VSSS9UZXN0LmpzCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFRvb2xzL1dlYkdQVVNoYWRpbmdMYW5ndWFnZVJJL1Rlc3QuanMJKHJldmlzaW9uIDIy MTQ0NikKKysrIFRvb2xzL1dlYkdQVVNoYWRpbmdMYW5ndWFnZVJJL1Rlc3QuanMJKHdvcmtpbmcg Y29weSkKQEAgLTM4LDcgKzM4LDcgQEAgZnVuY3Rpb24gbWFrZUludChwcm9ncmFtLCB2YWx1ZSkK IAogZnVuY3Rpb24gY2hlY2tJbnQocHJvZ3JhbSwgcmVzdWx0LCBleHBlY3RlZCkKIHsKLSAgICBp ZiAocmVzdWx0LnR5cGUgIT0gcHJvZ3JhbS5pbnRyaW5zaWNzLmludDMyKQorICAgIGlmICghcmVz dWx0LnR5cGUuZXF1YWxzKHByb2dyYW0uaW50cmluc2ljcy5pbnQzMikpCiAgICAgICAgIHRocm93 IG5ldyBFcnJvcigiV3JvbmcgcmVzdWx0IHR5cGU7IHJlc3VsdDogIiArIHJlc3VsdCk7CiAgICAg aWYgKHJlc3VsdC52YWx1ZSAhPSBleHBlY3RlZCkKICAgICAgICAgdGhyb3cgbmV3IEVycm9yKCJX cm9uZyByZXN1bHQ6ICIgKyByZXN1bHQgKyAiIChleHBlY3RlZCAiICsgZXhwZWN0ZWQgKyAiKSIp Owo=