33084 2009-12-31 09:21:41 -0800 Fix for RVCT -Otime fatal compiler error 2010-12-16 09:28:41 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) S60 Hardware S60 3rd edition RESOLVED FIXED P2 Normal --- 32715 32988 1 norbert.leser webkit-unassigned darin david.leong eric hausmann koshuin laszlo.gombos s.mathur tonikitoo volodimir.burlik webkit.review.bot yongjun.zhang oldest_to_newest 176202 0 45713 norbert.leser 2009-12-31 09:21:41 -0800 Created attachment 45713 Patch for Otime compiler error RVCT compiler with "-Otime -O3" optimization tries to optimize out inline new'ed pointers that are passed as arguments. Proposed patch assigns new'ed pointer explicitly outside function call. This was initially submitted with bug #32988. I separated this out, per suggestion, for independent tracking/fixing. 176203 1 webkit.review.bot 2009-12-31 09:23:40 -0800 Attachment 45713 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 JavaScriptCore/API/JSClassRef.cpp:153: Tab found; better to use spaces [whitespace/tab] [1] Total errors found: 1 176205 2 45714 norbert.leser 2009-12-31 09:28:25 -0800 Created attachment 45714 Updated patch for 33084 to fix tab issue Fix for accidental tab. 176206 3 webkit.review.bot 2009-12-31 09:29:03 -0800 style-queue ran check-webkit-style on attachment 45714 without any errors. 176300 4 tonikitoo 2010-01-01 20:29:53 -0800 norbert, usually you do not need review for build fixes like this one. please let me know if you want me to land, or set CQ+ 176489 5 45714 eric 2010-01-03 18:14:34 -0800 Comment on attachment 45714 Updated patch for 33084 to fix tab issue Have we filed a bug about this with RVCT? There will be a zillion of these. Every ::create() impelmentation in WebCore will have this problem as: return adoptRef(new Foo); is how we create objects in Foo::create(). This definitely needs a RVCT bug number and more explanation. I don't think you're going to get far with this type of change in WebCore. 177074 6 hausmann 2010-01-05 01:03:46 -0800 It appears that this happens with normal -O2 and also with -Otime. I can reproduce this issue by executing the commandline manually. This currently breaks the build on the trunk. 177125 7 norbert.leser 2010-01-05 06:26:48 -0800 I can confirm from our side as well that this compiler crash occurs even without the special -O options set, using the latest webkit from trunk. I submitted the bug to RVCT already but still awaiting a bug# assignment. 177609 8 norbert.leser 2010-01-06 09:27:35 -0800 Issue can be reproduced with both RVCT 2.2.686 and RVCT 4.0.697. We have raised case 444841 with ARM. 177617 9 45714 darin 2010-01-06 09:35:12 -0800 Comment on attachment 45714 Updated patch for 33084 to fix tab issue This change is not a good idea unless it's sufficient by itself to work around the issue. I don't think it's going to be practical to program around this RVCT bug. As others pointed out, there are hundreds of call sites like this in WebCore. 177641 10 norbert.leser 2010-01-06 10:43:59 -0800 (In reply to comment #9) > (From update of attachment 45714 [details]) > This change is not a good idea unless it's sufficient by itself to work around > the issue. I don't think it's going to be practical to program around this RVCT > bug. As others pointed out, there are hundreds of call sites like this in > WebCore. Darin and Eric, I certainly cannot argue with your points. Since we don't have the compiler fix yet and don't know exactly the circumstances that cause the compiler crash, - sure there might potentially be endless places where the compiler can choke. Thus, I cannot promise anything, but I know that with this single fix in the current webkit code, I can cleanly build for ARM target all the way through. Since the compiler error can also be reproduced with the latest version of RVCT, I assume that the bug will be tracked with high attention and we can limit the need potential future fixes of this kind, as webkit grows. Given this context, I ask you to approve this patch. 177643 11 eric 2010-01-06 10:46:24 -0800 Do we have a link to the compiler bug? I think that's a bare minimum for this ChangeLog. I get the impression that we don't know why the compiler is crashing? 177646 12 eric 2010-01-06 10:50:35 -0800 My worries here are: 1. Arbitrary/unnecessary changes to the code for a compiler bug we don't understand. 2. Changes which are incomplete (why does this only affect JSC and not WebCore??). 3. Changes w/o proper tracking back to a compiler bug so we know when we can revert them. 4. Changes which are not sustainable, such that the compiler is going to break again tomorrow because we don't understand the real issues, or because we're not making a proper, easily sustainable work around. It's very possible that all of the above concerns are invalid and this patch is the right way to go. But I think Darin and I could use a bit more convincing here. :) A link to the compiler bug (assuming it's available on a public website) would be a step in the right direction. 177649 13 norbert.leser 2010-01-06 10:53:18 -0800 (In reply to comment #11) > Do we have a link to the compiler bug? I think that's a bare minimum for this > ChangeLog. I get the impression that we don't know why the compiler is > crashing? Fair request. I don't know at the moment and will try to get a link. 178195 14 hausmann 2010-01-07 08:50:35 -0800 (In reply to comment #2) > Created an attachment (id=45714) [details] > Updated patch for 33084 to fix tab issue > > Fix for accidental tab. As a build issue this is now tracked in staging/4.6/webkit-bug-33084 at git@gitorious.org:+qtwebkit-developers/webkit/qtwebkit.git and merged into qtwebkit-4.6 in commit 3ad0918ee40f7cf185626ca30906d75f3f46fa6a 178240 15 norbert.leser 2010-01-07 10:05:48 -0800 (In reply to comment #13) > (In reply to comment #11) > > Do we have a link to the compiler bug? I think that's a bare minimum for this > > ChangeLog. I get the impression that we don't know why the compiler is > > crashing? > > Fair request. I don't know at the moment and will try to get a link. These are the official bug (Defect/Enhancement) numbers for this issue from ARM Ltd.: RVCT 2.2: DE729564. RVCT 4.0: DE729513. However, since this is proprietary code, what tracking is concerned, it appears to be a one-way street, even for us who filed the bug. We may see a reference to the bug once a patch was released. Hope, this helps in moving this patch forward. 178299 16 david.leong 2010-01-07 11:59:30 -0800 Can we flag the changes for RVCT only since this is a RVCT specific bug? 178322 17 darin 2010-01-07 12:40:25 -0800 (In reply to comment #16) > Can we flag the changes for RVCT only since this is a RVCT specific bug? We could, but I don't think that makes things any better. If these really are the only affected sites, I think the change is OK. 178323 18 45714 darin 2010-01-07 12:43:36 -0800 Comment on attachment 45714 Updated patch for 33084 to fix tab issue I would prefer the name "entry" to the letter "e". I would prefer that each call site has a brief comment like this one: // Use a local variable here to sidestep an RVCT compiler bug. I withdraw my earlier exception because you say these are the only 4 sites that need to be patched. r=me as is 178553 19 hausmann 2010-01-08 00:54:33 -0800 Thanks Darin for the review! Landed with your suggested modifications. Committed r52978: <http://trac.webkit.org/changeset/52978> 45713 2009-12-31 09:21:41 -0800 2009-12-31 09:28:25 -0800 Patch for Otime compiler error rvct_Otime_JSClassRef_cpp.patch text/plain 4077 norbert.leser SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDUyNjgxKQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDktMTItMzEgIE5vcmJlcnQg TGVzZXIgIDxub3JiZXJ0Lmxlc2VyQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSVkNUIGNvbXBpbGVyIHdpdGggIi1PdGltZSAtTzMi IG9wdGltaXphdGlvbiB0cmllcyB0byBvcHRpbWl6ZSBvdXQgCisgICAgICAgIGlubGluZSBuZXcn ZWQgcG9pbnRlcnMgdGhhdCBhcmUgcGFzc2VkIGFzIGFyZ3VtZW50cy4KKyAgICAgICAgUHJvcG9z ZWQgcGF0Y2ggYXNzaWducyBuZXcnZWQgcG9pbnRlciBleHBsaWNpdGx5IG91dHNpZGUgZnVuY3Rp b24gY2FsbC4KKworICAgICAgICAqIEFQSS9KU0NsYXNzUmVmLmNwcDoKKyAgICAgICAgKE9wYXF1 ZUpTQ2xhc3M6Ok9wYXF1ZUpTQ2xhc3MpOgorICAgICAgICAoT3BhcXVlSlNDbGFzc0NvbnRleHRE YXRhOjpPcGFxdWVKU0NsYXNzQ29udGV4dERhdGEpOgorCiAyMDA5LTEyLTI5ICBMYXN6bG8gR29t Ym9zICA8bGFzemxvLjEuZ29tYm9zQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBN YWNpZWogU3RhY2hvd2lhay4KSW5kZXg6IEphdmFTY3JpcHRDb3JlL0FQSS9KU0NsYXNzUmVmLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0Q29yZS9BUEkvSlNDbGFzc1JlZi5jcHAJKHJldmlz aW9uIDUyNjgxKQorKysgSmF2YVNjcmlwdENvcmUvQVBJL0pTQ2xhc3NSZWYuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC02MSw4ICs2MSw4IEBAIE9wYXF1ZUpTQ2xhc3M6Ok9wYXF1ZUpTQ2xhc3MoY29u c3QgSlNDbGEKICAgICBpZiAoY29uc3QgSlNTdGF0aWNWYWx1ZSogc3RhdGljVmFsdWUgPSBkZWZp bml0aW9uLT5zdGF0aWNWYWx1ZXMpIHsKICAgICAgICAgbV9zdGF0aWNWYWx1ZXMgPSBuZXcgT3Bh cXVlSlNDbGFzc1N0YXRpY1ZhbHVlc1RhYmxlKCk7CiAgICAgICAgIHdoaWxlIChzdGF0aWNWYWx1 ZS0+bmFtZSkgewotICAgICAgICAgICAgbV9zdGF0aWNWYWx1ZXMtPmFkZChVU3RyaW5nOjpjcmVh dGVGcm9tVVRGOChzdGF0aWNWYWx1ZS0+bmFtZSkucmVwKCktPnJlZigpLAotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgbmV3IFN0YXRpY1ZhbHVlRW50cnkoc3RhdGljVmFsdWUtPmdldFBy b3BlcnR5LCBzdGF0aWNWYWx1ZS0+c2V0UHJvcGVydHksIHN0YXRpY1ZhbHVlLT5hdHRyaWJ1dGVz KSk7CisgICAgICAgICAgICBTdGF0aWNWYWx1ZUVudHJ5KiBlID0gbmV3IFN0YXRpY1ZhbHVlRW50 cnkoc3RhdGljVmFsdWUtPmdldFByb3BlcnR5LCBzdGF0aWNWYWx1ZS0+c2V0UHJvcGVydHksIHN0 YXRpY1ZhbHVlLT5hdHRyaWJ1dGVzKTsKKyAgICAgICAgICAgIG1fc3RhdGljVmFsdWVzLT5hZGQo VVN0cmluZzo6Y3JlYXRlRnJvbVVURjgoc3RhdGljVmFsdWUtPm5hbWUpLnJlcCgpLT5yZWYoKSwg ZSk7CiAgICAgICAgICAgICArK3N0YXRpY1ZhbHVlOwogICAgICAgICB9CiAgICAgfQpAQCAtNzAs OCArNzAsOCBAQCBPcGFxdWVKU0NsYXNzOjpPcGFxdWVKU0NsYXNzKGNvbnN0IEpTQ2xhCiAgICAg aWYgKGNvbnN0IEpTU3RhdGljRnVuY3Rpb24qIHN0YXRpY0Z1bmN0aW9uID0gZGVmaW5pdGlvbi0+ c3RhdGljRnVuY3Rpb25zKSB7CiAgICAgICAgIG1fc3RhdGljRnVuY3Rpb25zID0gbmV3IE9wYXF1 ZUpTQ2xhc3NTdGF0aWNGdW5jdGlvbnNUYWJsZSgpOwogICAgICAgICB3aGlsZSAoc3RhdGljRnVu Y3Rpb24tPm5hbWUpIHsKLSAgICAgICAgICAgIG1fc3RhdGljRnVuY3Rpb25zLT5hZGQoVVN0cmlu Zzo6Y3JlYXRlRnJvbVVURjgoc3RhdGljRnVuY3Rpb24tPm5hbWUpLnJlcCgpLT5yZWYoKSwKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5ldyBTdGF0aWNGdW5jdGlvbkVudHJ5KHN0 YXRpY0Z1bmN0aW9uLT5jYWxsQXNGdW5jdGlvbiwgc3RhdGljRnVuY3Rpb24tPmF0dHJpYnV0ZXMp KTsKKyAgICAgICAgICAgIFN0YXRpY0Z1bmN0aW9uRW50cnkqIGUgPSBuZXcgU3RhdGljRnVuY3Rp b25FbnRyeShzdGF0aWNGdW5jdGlvbi0+Y2FsbEFzRnVuY3Rpb24sIHN0YXRpY0Z1bmN0aW9uLT5h dHRyaWJ1dGVzKTsKKyAgICAgICAgICAgIG1fc3RhdGljRnVuY3Rpb25zLT5hZGQoVVN0cmluZzo6 Y3JlYXRlRnJvbVVURjgoc3RhdGljRnVuY3Rpb24tPm5hbWUpLnJlcCgpLT5yZWYoKSwgZSk7CiAg ICAgICAgICAgICArK3N0YXRpY0Z1bmN0aW9uOwogICAgICAgICB9CiAgICAgfQpAQCAtMTQ4LDgg KzE0OCw5IEBAIE9wYXF1ZUpTQ2xhc3NDb250ZXh0RGF0YTo6T3BhcXVlSlNDbGFzc0MKICAgICAg ICAgT3BhcXVlSlNDbGFzc1N0YXRpY1ZhbHVlc1RhYmxlOjpjb25zdF9pdGVyYXRvciBlbmQgPSBq c0NsYXNzLT5tX3N0YXRpY1ZhbHVlcy0+ZW5kKCk7CiAgICAgICAgIGZvciAoT3BhcXVlSlNDbGFz c1N0YXRpY1ZhbHVlc1RhYmxlOjpjb25zdF9pdGVyYXRvciBpdCA9IGpzQ2xhc3MtPm1fc3RhdGlj VmFsdWVzLT5iZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQpIHsKICAgICAgICAgICAgIEFTU0VSVCgh aXQtPmZpcnN0LT5pZGVudGlmaWVyVGFibGUoKSk7Ci0gICAgICAgICAgICBzdGF0aWNWYWx1ZXMt PmFkZChVU3RyaW5nOjpSZXA6OmNyZWF0ZUNvcHlpbmcoaXQtPmZpcnN0LT5kYXRhKCksIGl0LT5m aXJzdC0+c2l6ZSgpKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5ldyBTdGF0aWNW YWx1ZUVudHJ5KGl0LT5zZWNvbmQtPmdldFByb3BlcnR5LCBpdC0+c2Vjb25kLT5zZXRQcm9wZXJ0 eSwgaXQtPnNlY29uZC0+YXR0cmlidXRlcykpOworICAgICAgICAgICAgU3RhdGljVmFsdWVFbnRy eSogZSA9IG5ldyBTdGF0aWNWYWx1ZUVudHJ5KGl0LT5zZWNvbmQtPmdldFByb3BlcnR5LCBpdC0+ c2Vjb25kLT5zZXRQcm9wZXJ0eSwgaXQtPnNlY29uZC0+YXR0cmlidXRlcyk7CisgICAgICAgICAg ICBzdGF0aWNWYWx1ZXMtPmFkZChVU3RyaW5nOjpSZXA6OmNyZWF0ZUNvcHlpbmcoaXQtPmZpcnN0 LT5kYXRhKCksIGl0LT5maXJzdC0+c2l6ZSgpKSwgZSk7CisJICAgICAgCiAgICAgICAgIH0KICAg ICAgICAgICAgIAogICAgIH0gZWxzZQpAQCAtMTYxLDggKzE2Miw4IEBAIE9wYXF1ZUpTQ2xhc3ND b250ZXh0RGF0YTo6T3BhcXVlSlNDbGFzc0MKICAgICAgICAgT3BhcXVlSlNDbGFzc1N0YXRpY0Z1 bmN0aW9uc1RhYmxlOjpjb25zdF9pdGVyYXRvciBlbmQgPSBqc0NsYXNzLT5tX3N0YXRpY0Z1bmN0 aW9ucy0+ZW5kKCk7CiAgICAgICAgIGZvciAoT3BhcXVlSlNDbGFzc1N0YXRpY0Z1bmN0aW9uc1Rh YmxlOjpjb25zdF9pdGVyYXRvciBpdCA9IGpzQ2xhc3MtPm1fc3RhdGljRnVuY3Rpb25zLT5iZWdp bigpOyBpdCAhPSBlbmQ7ICsraXQpIHsKICAgICAgICAgICAgIEFTU0VSVCghaXQtPmZpcnN0LT5p ZGVudGlmaWVyVGFibGUoKSk7Ci0gICAgICAgICAgICBzdGF0aWNGdW5jdGlvbnMtPmFkZChVU3Ry aW5nOjpSZXA6OmNyZWF0ZUNvcHlpbmcoaXQtPmZpcnN0LT5kYXRhKCksIGl0LT5maXJzdC0+c2l6 ZSgpKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5ldyBTdGF0aWNGdW5jdGlvbkVu dHJ5KGl0LT5zZWNvbmQtPmNhbGxBc0Z1bmN0aW9uLCBpdC0+c2Vjb25kLT5hdHRyaWJ1dGVzKSk7 CisgICAgICAgICAgICBTdGF0aWNGdW5jdGlvbkVudHJ5KiBlID0gbmV3IFN0YXRpY0Z1bmN0aW9u RW50cnkoaXQtPnNlY29uZC0+Y2FsbEFzRnVuY3Rpb24sIGl0LT5zZWNvbmQtPmF0dHJpYnV0ZXMp OworICAgICAgICAgICAgc3RhdGljRnVuY3Rpb25zLT5hZGQoVVN0cmluZzo6UmVwOjpjcmVhdGVD b3B5aW5nKGl0LT5maXJzdC0+ZGF0YSgpLCBpdC0+Zmlyc3QtPnNpemUoKSksIGUpOwogICAgICAg ICB9CiAgICAgICAgICAgICAKICAgICB9IGVsc2UK 45714 2009-12-31 09:28:25 -0800 2010-01-07 12:43:36 -0800 Updated patch for 33084 to fix tab issue rvct_Otime_JSClassRef_cpp.patch text/plain 4070 norbert.leser SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDUyNjgxKQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDktMTItMzEgIE5vcmJlcnQg TGVzZXIgIDxub3JiZXJ0Lmxlc2VyQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSVkNUIGNvbXBpbGVyIHdpdGggIi1PdGltZSAtTzMi IG9wdGltaXphdGlvbiB0cmllcyB0byBvcHRpbWl6ZSBvdXQgCisgICAgICAgIGlubGluZSBuZXcn ZWQgcG9pbnRlcnMgdGhhdCBhcmUgcGFzc2VkIGFzIGFyZ3VtZW50cy4KKyAgICAgICAgUHJvcG9z ZWQgcGF0Y2ggYXNzaWducyBuZXcnZWQgcG9pbnRlciBleHBsaWNpdGx5IG91dHNpZGUgZnVuY3Rp b24gY2FsbC4KKworICAgICAgICAqIEFQSS9KU0NsYXNzUmVmLmNwcDoKKyAgICAgICAgKE9wYXF1 ZUpTQ2xhc3M6Ok9wYXF1ZUpTQ2xhc3MpOgorICAgICAgICAoT3BhcXVlSlNDbGFzc0NvbnRleHRE YXRhOjpPcGFxdWVKU0NsYXNzQ29udGV4dERhdGEpOgorCiAyMDA5LTEyLTI5ICBMYXN6bG8gR29t Ym9zICA8bGFzemxvLjEuZ29tYm9zQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBN YWNpZWogU3RhY2hvd2lhay4KSW5kZXg6IEphdmFTY3JpcHRDb3JlL0FQSS9KU0NsYXNzUmVmLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0Q29yZS9BUEkvSlNDbGFzc1JlZi5jcHAJKHJldmlz aW9uIDUyNjgxKQorKysgSmF2YVNjcmlwdENvcmUvQVBJL0pTQ2xhc3NSZWYuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC02MSw4ICs2MSw4IEBAIE9wYXF1ZUpTQ2xhc3M6Ok9wYXF1ZUpTQ2xhc3MoY29u c3QgSlNDbGEKICAgICBpZiAoY29uc3QgSlNTdGF0aWNWYWx1ZSogc3RhdGljVmFsdWUgPSBkZWZp bml0aW9uLT5zdGF0aWNWYWx1ZXMpIHsKICAgICAgICAgbV9zdGF0aWNWYWx1ZXMgPSBuZXcgT3Bh cXVlSlNDbGFzc1N0YXRpY1ZhbHVlc1RhYmxlKCk7CiAgICAgICAgIHdoaWxlIChzdGF0aWNWYWx1 ZS0+bmFtZSkgewotICAgICAgICAgICAgbV9zdGF0aWNWYWx1ZXMtPmFkZChVU3RyaW5nOjpjcmVh dGVGcm9tVVRGOChzdGF0aWNWYWx1ZS0+bmFtZSkucmVwKCktPnJlZigpLAotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgbmV3IFN0YXRpY1ZhbHVlRW50cnkoc3RhdGljVmFsdWUtPmdldFBy b3BlcnR5LCBzdGF0aWNWYWx1ZS0+c2V0UHJvcGVydHksIHN0YXRpY1ZhbHVlLT5hdHRyaWJ1dGVz KSk7CisgICAgICAgICAgICBTdGF0aWNWYWx1ZUVudHJ5KiBlID0gbmV3IFN0YXRpY1ZhbHVlRW50 cnkoc3RhdGljVmFsdWUtPmdldFByb3BlcnR5LCBzdGF0aWNWYWx1ZS0+c2V0UHJvcGVydHksIHN0 YXRpY1ZhbHVlLT5hdHRyaWJ1dGVzKTsKKyAgICAgICAgICAgIG1fc3RhdGljVmFsdWVzLT5hZGQo VVN0cmluZzo6Y3JlYXRlRnJvbVVURjgoc3RhdGljVmFsdWUtPm5hbWUpLnJlcCgpLT5yZWYoKSwg ZSk7CiAgICAgICAgICAgICArK3N0YXRpY1ZhbHVlOwogICAgICAgICB9CiAgICAgfQpAQCAtNzAs OCArNzAsOCBAQCBPcGFxdWVKU0NsYXNzOjpPcGFxdWVKU0NsYXNzKGNvbnN0IEpTQ2xhCiAgICAg aWYgKGNvbnN0IEpTU3RhdGljRnVuY3Rpb24qIHN0YXRpY0Z1bmN0aW9uID0gZGVmaW5pdGlvbi0+ c3RhdGljRnVuY3Rpb25zKSB7CiAgICAgICAgIG1fc3RhdGljRnVuY3Rpb25zID0gbmV3IE9wYXF1 ZUpTQ2xhc3NTdGF0aWNGdW5jdGlvbnNUYWJsZSgpOwogICAgICAgICB3aGlsZSAoc3RhdGljRnVu Y3Rpb24tPm5hbWUpIHsKLSAgICAgICAgICAgIG1fc3RhdGljRnVuY3Rpb25zLT5hZGQoVVN0cmlu Zzo6Y3JlYXRlRnJvbVVURjgoc3RhdGljRnVuY3Rpb24tPm5hbWUpLnJlcCgpLT5yZWYoKSwKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5ldyBTdGF0aWNGdW5jdGlvbkVudHJ5KHN0 YXRpY0Z1bmN0aW9uLT5jYWxsQXNGdW5jdGlvbiwgc3RhdGljRnVuY3Rpb24tPmF0dHJpYnV0ZXMp KTsKKyAgICAgICAgICAgIFN0YXRpY0Z1bmN0aW9uRW50cnkqIGUgPSBuZXcgU3RhdGljRnVuY3Rp b25FbnRyeShzdGF0aWNGdW5jdGlvbi0+Y2FsbEFzRnVuY3Rpb24sIHN0YXRpY0Z1bmN0aW9uLT5h dHRyaWJ1dGVzKTsKKyAgICAgICAgICAgIG1fc3RhdGljRnVuY3Rpb25zLT5hZGQoVVN0cmluZzo6 Y3JlYXRlRnJvbVVURjgoc3RhdGljRnVuY3Rpb24tPm5hbWUpLnJlcCgpLT5yZWYoKSwgZSk7CiAg ICAgICAgICAgICArK3N0YXRpY0Z1bmN0aW9uOwogICAgICAgICB9CiAgICAgfQpAQCAtMTQ4LDgg KzE0OCw5IEBAIE9wYXF1ZUpTQ2xhc3NDb250ZXh0RGF0YTo6T3BhcXVlSlNDbGFzc0MKICAgICAg ICAgT3BhcXVlSlNDbGFzc1N0YXRpY1ZhbHVlc1RhYmxlOjpjb25zdF9pdGVyYXRvciBlbmQgPSBq c0NsYXNzLT5tX3N0YXRpY1ZhbHVlcy0+ZW5kKCk7CiAgICAgICAgIGZvciAoT3BhcXVlSlNDbGFz c1N0YXRpY1ZhbHVlc1RhYmxlOjpjb25zdF9pdGVyYXRvciBpdCA9IGpzQ2xhc3MtPm1fc3RhdGlj VmFsdWVzLT5iZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQpIHsKICAgICAgICAgICAgIEFTU0VSVCgh aXQtPmZpcnN0LT5pZGVudGlmaWVyVGFibGUoKSk7Ci0gICAgICAgICAgICBzdGF0aWNWYWx1ZXMt PmFkZChVU3RyaW5nOjpSZXA6OmNyZWF0ZUNvcHlpbmcoaXQtPmZpcnN0LT5kYXRhKCksIGl0LT5m aXJzdC0+c2l6ZSgpKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5ldyBTdGF0aWNW YWx1ZUVudHJ5KGl0LT5zZWNvbmQtPmdldFByb3BlcnR5LCBpdC0+c2Vjb25kLT5zZXRQcm9wZXJ0 eSwgaXQtPnNlY29uZC0+YXR0cmlidXRlcykpOworICAgICAgICAgICAgU3RhdGljVmFsdWVFbnRy eSogZSA9IG5ldyBTdGF0aWNWYWx1ZUVudHJ5KGl0LT5zZWNvbmQtPmdldFByb3BlcnR5LCBpdC0+ c2Vjb25kLT5zZXRQcm9wZXJ0eSwgaXQtPnNlY29uZC0+YXR0cmlidXRlcyk7CisgICAgICAgICAg ICBzdGF0aWNWYWx1ZXMtPmFkZChVU3RyaW5nOjpSZXA6OmNyZWF0ZUNvcHlpbmcoaXQtPmZpcnN0 LT5kYXRhKCksIGl0LT5maXJzdC0+c2l6ZSgpKSwgZSk7CisKICAgICAgICAgfQogICAgICAgICAg ICAgCiAgICAgfSBlbHNlCkBAIC0xNjEsOCArMTYyLDggQEAgT3BhcXVlSlNDbGFzc0NvbnRleHRE YXRhOjpPcGFxdWVKU0NsYXNzQwogICAgICAgICBPcGFxdWVKU0NsYXNzU3RhdGljRnVuY3Rpb25z VGFibGU6OmNvbnN0X2l0ZXJhdG9yIGVuZCA9IGpzQ2xhc3MtPm1fc3RhdGljRnVuY3Rpb25zLT5l bmQoKTsKICAgICAgICAgZm9yIChPcGFxdWVKU0NsYXNzU3RhdGljRnVuY3Rpb25zVGFibGU6OmNv bnN0X2l0ZXJhdG9yIGl0ID0ganNDbGFzcy0+bV9zdGF0aWNGdW5jdGlvbnMtPmJlZ2luKCk7IGl0 ICE9IGVuZDsgKytpdCkgewogICAgICAgICAgICAgQVNTRVJUKCFpdC0+Zmlyc3QtPmlkZW50aWZp ZXJUYWJsZSgpKTsKLSAgICAgICAgICAgIHN0YXRpY0Z1bmN0aW9ucy0+YWRkKFVTdHJpbmc6OlJl cDo6Y3JlYXRlQ29weWluZyhpdC0+Zmlyc3QtPmRhdGEoKSwgaXQtPmZpcnN0LT5zaXplKCkpLAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbmV3IFN0YXRpY0Z1bmN0aW9uRW50cnkoaXQt PnNlY29uZC0+Y2FsbEFzRnVuY3Rpb24sIGl0LT5zZWNvbmQtPmF0dHJpYnV0ZXMpKTsKKyAgICAg ICAgICAgIFN0YXRpY0Z1bmN0aW9uRW50cnkqIGUgPSBuZXcgU3RhdGljRnVuY3Rpb25FbnRyeShp dC0+c2Vjb25kLT5jYWxsQXNGdW5jdGlvbiwgaXQtPnNlY29uZC0+YXR0cmlidXRlcyk7CisgICAg ICAgICAgICBzdGF0aWNGdW5jdGlvbnMtPmFkZChVU3RyaW5nOjpSZXA6OmNyZWF0ZUNvcHlpbmco aXQtPmZpcnN0LT5kYXRhKCksIGl0LT5maXJzdC0+c2l6ZSgpKSwgZSk7CiAgICAgICAgIH0KICAg ICAgICAgICAgIAogICAgIH0gZWxzZQo=