149837 2015-10-06 03:17:05 -0700 Binding generator should add builtin header for JSBuiltin attributes 2015-10-06 09:50:58 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 youennf youennf calvaris cdumez commit-queue darin oldest_to_newest 1130926 0 youennf 2015-10-06 03:17:05 -0700 Following on https://bugs.webkit.org/show_bug.cgi?id=149759, we should further refactor AddIncludesForJSBuiltinMethods, since returning 1 is no longer needed. We should also handle JSBuiltin attributes similarly to JSBuiltin functions. 1130928 1 calvaris 2015-10-06 03:43:41 -0700 (In reply to comment #0) > Following on https://bugs.webkit.org/show_bug.cgi?id=149759, we should > further refactor AddIncludesForJSBuiltinMethods, since returning 1 is no > longer needed. > We should also handle JSBuiltin attributes similarly to JSBuiltin functions. Returning 1 is needed to break the loop. 1130930 2 262509 youennf 2015-10-06 04:49:13 -0700 Created attachment 262509 Patch 1130931 3 youennf 2015-10-06 04:52:20 -0700 (In reply to comment #1) > (In reply to comment #0) > > Following on https://bugs.webkit.org/show_bug.cgi?id=149759, we should > > further refactor AddIncludesForJSBuiltinMethods, since returning 1 is no > > longer needed. > > We should also handle JSBuiltin attributes similarly to JSBuiltin functions. > > Returning 1 is needed to break the loop. Not breaking the loop has the slight benefit of being able to handle different Conditionals. I updated TestObj.idl to show this in the binding tests. 1130949 4 calvaris 2015-10-06 07:25:59 -0700 (In reply to comment #3) > (In reply to comment #1) > > (In reply to comment #0) > > > Following on https://bugs.webkit.org/show_bug.cgi?id=149759, we should > > > further refactor AddIncludesForJSBuiltinMethods, since returning 1 is no > > > longer needed. > > > We should also handle JSBuiltin attributes similarly to JSBuiltin functions. > > > > Returning 1 is needed to break the loop. > > Not breaking the loop has the slight benefit of being able to handle > different Conditionals. > I updated TestObj.idl to show this in the binding tests. Understood. 1131000 5 262509 commit-queue 2015-10-06 09:50:53 -0700 Comment on attachment 262509 Patch Clearing flags on attachment: 262509 Committed r190620: <http://trac.webkit.org/changeset/190620> 1131001 6 commit-queue 2015-10-06 09:50:58 -0700 All reviewed patches have been landed. Closing bug. 262509 2015-10-06 04:49:13 -0700 2015-10-06 09:50:53 -0700 Patch bug-149837-20151006084842.patch text/plain 11640 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMTkwNjExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTU0NjU3YmM0N2QwY2I2 YWVkNGQ5YzFkYjc3MjBkY2NlYTdlMzQxMS4uNTc1MTkxMzNmZTIzNmZjMzc2OWYzNzhkZDZmYTky MDA1MDMwYWNjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE1LTEwLTA2ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uLmZhYmxldEBjcmYuY2Fub24uZnI+CisKKyAgICAgICAgQmluZGlu ZyBnZW5lcmF0b3Igc2hvdWxkIGFkZCBidWlsdGluIGhlYWRlciBmb3IgSlNCdWlsdGluIGF0dHJp YnV0ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0 OTgzNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVu c3VyZWQgWFhCdWlsdGlucy5oIGhlYWRlciBpcyBpbmNsdWRlZCBmb3IgYnVpbHRpbiBhdHRyaWJ1 dGVzLgorICAgICAgICBSZW5hbWVkIEFkZEluY2x1ZGVzRm9ySlNCdWlsdGluTWV0aG9kcyBhcyBB ZGRKU0J1aWx0aW5JbmNsdWRlc0lmTmVlZGVkLgorICAgICAgICBUZXN0IGxvb3AgaXMgZG9uZSB0 aHJvdWdoIGFsbCBmdW5jdGlvbnMgYW5kIGF0dHJpYnV0ZXMgdG8gaGFuZGxlIGNvbmRpdGlvbmFs IGNvcnJlY3RseS4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIGFuZCBhZGRlZCBiaW5k aW5nIHRlc3RzLgorCisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMu cG06CisgICAgICAgIChHZW5lcmF0ZUltcGxlbWVudGF0aW9uKToKKyAgICAgICAgKEFkZEpTQnVp bHRpbkluY2x1ZGVzSWZOZWVkZWQpOgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvdGVzdC9K Uy9KU1Rlc3RPYmouY3BwOgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvdGVzdC9PYmpDL0RP TVRlc3RPYmouaDoKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL3Rlc3QvT2JqQy9ET01UZXN0 T2JqLm1tOgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvdGVzdC9UZXN0T2JqLmlkbDoKKwog MjAxNS0xMC0wNiAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgog CiAgICAgICAgIFJlcG9ydCBlcnJvciB3aGVuIG1haW4gcmVzb3VyY2UgaXMgYmxvY2tlZCBieSBj b250ZW50IGJsb2NrZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Njcmlw dHMvQ29kZUdlbmVyYXRvckpTLnBtIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9D b2RlR2VuZXJhdG9ySlMucG0KaW5kZXggOGM4MDc3ZWUzMWI0OWZmNDA4MGI1ZjIzZGM0ZWY1ZTFl Y2Y5NWM2Yy4uNWJhNjlmNzNlNGIxNGI5ZjI1NzY3Zjk5MDVlOTRhYWNjZTYwY2VmOSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMucG0K KysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMucG0K QEAgLTE3OTQsNyArMTc5NCw3IEBAIHN1YiBHZW5lcmF0ZUltcGxlbWVudGF0aW9uCiAKICAgICBt eSAkaW1wbFR5cGUgPSBHZXRJbXBsQ2xhc3NOYW1lKCRpbnRlcmZhY2VOYW1lKTsKIAotICAgIEFk ZEluY2x1ZGVzRm9ySlNCdWlsdGluTWV0aG9kcygkaW50ZXJmYWNlKTsKKyAgICBBZGRKU0J1aWx0 aW5JbmNsdWRlc0lmTmVlZGVkKCRpbnRlcmZhY2UpOwogCiAgICAgQGltcGxDb250ZW50ID0gKCk7 CiAKQEAgLTUxMDAsMzUgKzUxMDAsMjMgQEAgc3ViIENvbXB1dGVGdW5jdGlvblNwZWNpYWwKICAg ICByZXR1cm4gKEBzcGVjaWFscyA+IDApID8gam9pbigiIHwgIiwgQHNwZWNpYWxzKSA6ICIwIjsK IH0KIAotc3ViIFVzZUpTQnVpbHRpbnMKK3N1YiBBZGRKU0J1aWx0aW5JbmNsdWRlc0lmTmVlZGVk KCkKIHsKICAgICBteSAkaW50ZXJmYWNlID0gc2hpZnQ7Ci0gICAgZm9yZWFjaCBteSAkZnVuY3Rp b24gKEB7JGludGVyZmFjZS0+ZnVuY3Rpb25zfSkgewotICAgICAgICBpZiAoJGZ1bmN0aW9uLT5z aWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJKU0J1aWx0aW4ifSkgewotICAgICAgICAg ICAgcmV0dXJuIDE7Ci0gICAgICAgIH0KLSAgICB9Ci0gICAgcmV0dXJuIDAKLX0KIAotc3ViIEFk ZEluY2x1ZGVzRm9ySlNCdWlsdGluTWV0aG9kcygpCi17Ci0gICAgbXkgJGludGVyZmFjZSA9IHNo aWZ0OworICAgIG15ICRpbmNsdWRlID0gJGludGVyZmFjZS0+bmFtZSAuICJCdWlsdGlucy5oIjsK IAogICAgIGlmICgkaW50ZXJmYWNlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsiSlNCdWlsdGluQ29u c3RydWN0b3IifSkgewotICAgICAgICBBZGRUb0ltcGxJbmNsdWRlcygkaW50ZXJmYWNlLT5uYW1l IC4gIkJ1aWx0aW5zLmgiKTsKLSAgICAgICAgcmV0dXJuIDE7CisgICAgICAgIEFkZFRvSW1wbElu Y2x1ZGVzKCRpbmNsdWRlKTsKKyAgICAgICAgcmV0dXJuOwogICAgIH0KIAogICAgIGZvcmVhY2gg bXkgJGZ1bmN0aW9uIChAeyRpbnRlcmZhY2UtPmZ1bmN0aW9uc30pIHsKLSAgICAgICAgbmV4dCB1 bmxlc3MgKCRmdW5jdGlvbi0+c2lnbmF0dXJlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsiSlNCdWls dGluIn0pOwotICAgICAgICBteSAkc2NvcGVOYW1lID0gJGZ1bmN0aW9uLT5zaWduYXR1cmUtPmV4 dGVuZGVkQXR0cmlidXRlcy0+eyJJbXBsZW1lbnRlZEJ5In07Ci0gICAgICAgIGlmICghJHNjb3Bl TmFtZSkgewotICAgICAgICAgICAgJHNjb3BlTmFtZSA9ICRpbnRlcmZhY2UtPm5hbWU7Ci0gICAg ICAgIH0KLSAgICAgICAgQWRkVG9JbXBsSW5jbHVkZXMoJHNjb3BlTmFtZSAuICJCdWlsdGlucy5o IiwgJGZ1bmN0aW9uLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJDb25kaXRpb25h bCJ9KTsKKyAgICAgICAgQWRkVG9JbXBsSW5jbHVkZXMoJGluY2x1ZGUsICRmdW5jdGlvbi0+c2ln bmF0dXJlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsiQ29uZGl0aW9uYWwifSkgaWYgJGZ1bmN0aW9u LT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJKU0J1aWx0aW4ifTsKKyAgICB9CiAK LSAgICAgICAgcmV0dXJuIDE7CisgICAgZm9yZWFjaCBteSAkYXR0cmlidXRlIChAeyRpbnRlcmZh Y2UtPmF0dHJpYnV0ZXN9KSB7CisgICAgICAgIEFkZFRvSW1wbEluY2x1ZGVzKCRpbmNsdWRlLCAk YXR0cmlidXRlLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJDb25kaXRpb25hbCJ9 KSBpZiAkYXR0cmlidXRlLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJKU0J1aWx0 aW4ifTsKICAgICB9CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Nj cmlwdHMvdGVzdC9KUy9KU1Rlc3RPYmouY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2Ny aXB0cy90ZXN0L0pTL0pTVGVzdE9iai5jcHAKaW5kZXggODcyMzM2ZTE1YzdkZmU4MTkzZjg5ODY5 ZjNmMzA4Njg0YjY2NGZmNi4uOGY5NTlhZmIwOWViMGU0NDVhMWQwZWYxYzE1YmRiNjQ1NjhlNWE0 MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pT VGVzdE9iai5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pT L0pTVGVzdE9iai5jcHAKQEAgLTUxLDcgKzUxLDYgQEAKICNpbmNsdWRlICJTZXR0aW5ncy5oIgog I2luY2x1ZGUgIlRlc3ROb2RlLmgiCiAjaW5jbHVkZSAiVGVzdE9iai5oIgotI2luY2x1ZGUgIlRl c3RPYmpCdWlsdGlucy5oIgogI2luY2x1ZGUgIlVSTC5oIgogI2luY2x1ZGUgImJvb2wuaCIKICNp bmNsdWRlIDxiaW5kaW5ncy9TY3JpcHRWYWx1ZS5oPgpAQCAtNzQsNiArNzMsMTAgQEAKICNpbmNs dWRlICJKU1Rlc3RPYmplY3RDLmgiCiAjZW5kaWYKIAorI2lmIEVOQUJMRShDb25kaXRpb24zKSB8 fCBFTkFCTEUoQ29uZGl0aW9uNCkKKyNpbmNsdWRlICJUZXN0T2JqQnVpbHRpbnMuaCIKKyNlbmRp ZgorCiB1c2luZyBuYW1lc3BhY2UgSlNDOwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC01Mzgs OCArNTQxLDE2IEBAIHN0YXRpYyBjb25zdCBIYXNoVGFibGVWYWx1ZSBKU1Rlc3RPYmpQcm90b3R5 cGVUYWJsZVZhbHVlc1tdID0KICAgICB7ICJzdHJpbmdBdHRyV2l0aEdldHRlckV4Y2VwdGlvbiIs IEN1c3RvbUFjY2Vzc29yLCBOb0ludHJpbnNpYywgeyAoaW50cHRyX3Qpc3RhdGljX2Nhc3Q8UHJv cGVydHlTbG90OjpHZXRWYWx1ZUZ1bmM+KGpzVGVzdE9ialN0cmluZ0F0dHJXaXRoR2V0dGVyRXhj ZXB0aW9uKSwgKGludHB0cl90KSBzdGF0aWNfY2FzdDxQdXRQcm9wZXJ0eVNsb3Q6OlB1dFZhbHVl RnVuYz4oc2V0SlNUZXN0T2JqU3RyaW5nQXR0cldpdGhHZXR0ZXJFeGNlcHRpb24pIH0gfSwKICAg ICB7ICJzdHJpbmdBdHRyV2l0aFNldHRlckV4Y2VwdGlvbiIsIEN1c3RvbUFjY2Vzc29yLCBOb0lu dHJpbnNpYywgeyAoaW50cHRyX3Qpc3RhdGljX2Nhc3Q8UHJvcGVydHlTbG90OjpHZXRWYWx1ZUZ1 bmM+KGpzVGVzdE9ialN0cmluZ0F0dHJXaXRoU2V0dGVyRXhjZXB0aW9uKSwgKGludHB0cl90KSBz dGF0aWNfY2FzdDxQdXRQcm9wZXJ0eVNsb3Q6OlB1dFZhbHVlRnVuYz4oc2V0SlNUZXN0T2JqU3Ry aW5nQXR0cldpdGhTZXR0ZXJFeGNlcHRpb24pIH0gfSwKICAgICB7ICJzdHJpY3RUeXBlQ2hlY2tp bmdBdHRyaWJ1dGUiLCBDdXN0b21BY2Nlc3NvciwgTm9JbnRyaW5zaWMsIHsgKGludHB0cl90KXN0 YXRpY19jYXN0PFByb3BlcnR5U2xvdDo6R2V0VmFsdWVGdW5jPihqc1Rlc3RPYmpTdHJpY3RUeXBl Q2hlY2tpbmdBdHRyaWJ1dGUpLCAoaW50cHRyX3QpIHN0YXRpY19jYXN0PFB1dFByb3BlcnR5U2xv dDo6UHV0VmFsdWVGdW5jPihzZXRKU1Rlc3RPYmpTdHJpY3RUeXBlQ2hlY2tpbmdBdHRyaWJ1dGUp IH0gfSwKKyNpZiBFTkFCTEUoQ29uZGl0aW9uNCkKICAgICB7ICJqc0J1aWx0aW5BdHRyaWJ1dGUi LCBBY2Nlc3NvciB8IEJ1aWx0aW4sIE5vSW50cmluc2ljLCB7IChpbnRwdHJfdClzdGF0aWNfY2Fz dDxCdWlsdGluR2VuZXJhdG9yPih0ZXN0T2JqSnNCdWlsdGluQXR0cmlidXRlQ29kZUdlbmVyYXRv ciksIChpbnRwdHJfdCkgKHNldFRlc3RPYmpKc0J1aWx0aW5BdHRyaWJ1dGVDb2RlR2VuZXJhdG9y KSB9IH0sCisjZWxzZQorICAgIHsgMCwgMCwgTm9JbnRyaW5zaWMsIHsgMCwgMCB9IH0sCisjZW5k aWYKKyNpZiBFTkFCTEUoQ29uZGl0aW9uNCkKICAgICB7ICJqc0J1aWx0aW5SZWFkT25seUF0dHJp YnV0ZSIsIFJlYWRPbmx5IHwgQWNjZXNzb3IgfCBCdWlsdGluLCBOb0ludHJpbnNpYywgeyAoaW50 cHRyX3Qpc3RhdGljX2Nhc3Q8QnVpbHRpbkdlbmVyYXRvcj4odGVzdE9iakpzQnVpbHRpblJlYWRP bmx5QXR0cmlidXRlQ29kZUdlbmVyYXRvciksIChpbnRwdHJfdCkgKDApIH0gfSwKKyNlbHNlCisg ICAgeyAwLCAwLCBOb0ludHJpbnNpYywgeyAwLCAwIH0gfSwKKyNlbmRpZgogICAgIHsgIm9uZm9v IiwgQ3VzdG9tQWNjZXNzb3IsIE5vSW50cmluc2ljLCB7IChpbnRwdHJfdClzdGF0aWNfY2FzdDxQ cm9wZXJ0eVNsb3Q6OkdldFZhbHVlRnVuYz4oanNUZXN0T2JqT25mb28pLCAoaW50cHRyX3QpIHN0 YXRpY19jYXN0PFB1dFByb3BlcnR5U2xvdDo6UHV0VmFsdWVGdW5jPihzZXRKU1Rlc3RPYmpPbmZv bykgfSB9LAogICAgIHsgIndpdGhTY3JpcHRTdGF0ZUF0dHJpYnV0ZSIsIEN1c3RvbUFjY2Vzc29y LCBOb0ludHJpbnNpYywgeyAoaW50cHRyX3Qpc3RhdGljX2Nhc3Q8UHJvcGVydHlTbG90OjpHZXRW YWx1ZUZ1bmM+KGpzVGVzdE9ialdpdGhTY3JpcHRTdGF0ZUF0dHJpYnV0ZSksIChpbnRwdHJfdCkg c3RhdGljX2Nhc3Q8UHV0UHJvcGVydHlTbG90OjpQdXRWYWx1ZUZ1bmM+KHNldEpTVGVzdE9ialdp dGhTY3JpcHRTdGF0ZUF0dHJpYnV0ZSkgfSB9LAogICAgIHsgIndpdGhDYWxsV2l0aEFuZFNldHRl ckNhbGxXaXRoQXR0cmlidXRlIiwgQ3VzdG9tQWNjZXNzb3IsIE5vSW50cmluc2ljLCB7IChpbnRw dHJfdClzdGF0aWNfY2FzdDxQcm9wZXJ0eVNsb3Q6OkdldFZhbHVlRnVuYz4oanNUZXN0T2JqV2l0 aENhbGxXaXRoQW5kU2V0dGVyQ2FsbFdpdGhBdHRyaWJ1dGUpLCAoaW50cHRyX3QpIHN0YXRpY19j YXN0PFB1dFByb3BlcnR5U2xvdDo6UHV0VmFsdWVGdW5jPihzZXRKU1Rlc3RPYmpXaXRoQ2FsbFdp dGhBbmRTZXR0ZXJDYWxsV2l0aEF0dHJpYnV0ZSkgfSB9LApAQCAtNjI1LDggKzYzNiwxNiBAQCBz dGF0aWMgY29uc3QgSGFzaFRhYmxlVmFsdWUgSlNUZXN0T2JqUHJvdG90eXBlVGFibGVWYWx1ZXNb XSA9CiAgICAgeyAiY3VzdG9tTWV0aG9kV2l0aEFyZ3MiLCBKU0M6OkZ1bmN0aW9uLCBOb0ludHJp bnNpYywgeyAoaW50cHRyX3Qpc3RhdGljX2Nhc3Q8TmF0aXZlRnVuY3Rpb24+KGpzVGVzdE9ialBy b3RvdHlwZUZ1bmN0aW9uQ3VzdG9tTWV0aG9kV2l0aEFyZ3MpLCAoaW50cHRyX3QpICgzKSB9IH0s CiAgICAgeyAiY3VzdG9tQmluZGluZ01ldGhvZCIsIEpTQzo6RnVuY3Rpb24sIE5vSW50cmluc2lj LCB7IChpbnRwdHJfdClzdGF0aWNfY2FzdDxOYXRpdmVGdW5jdGlvbj4oanNUZXN0T2JqUHJvdG90 eXBlRnVuY3Rpb25DdXN0b21CaW5kaW5nTWV0aG9kKSwgKGludHB0cl90KSAoMCkgfSB9LAogICAg IHsgImN1c3RvbUJpbmRpbmdNZXRob2RXaXRoQXJncyIsIEpTQzo6RnVuY3Rpb24sIE5vSW50cmlu c2ljLCB7IChpbnRwdHJfdClzdGF0aWNfY2FzdDxOYXRpdmVGdW5jdGlvbj4oanNUZXN0T2JqUHJv dG90eXBlRnVuY3Rpb25DdXN0b21CaW5kaW5nTWV0aG9kV2l0aEFyZ3MpLCAoaW50cHRyX3QpICgz KSB9IH0sCisjaWYgRU5BQkxFKENvbmRpdGlvbjMpCiAgICAgeyAianNCdWlsdGluTWV0aG9kIiwg SlNDOjpCdWlsdGluLCBOb0ludHJpbnNpYywgeyAoaW50cHRyX3Qpc3RhdGljX2Nhc3Q8QnVpbHRp bkdlbmVyYXRvcj4odGVzdE9iakpzQnVpbHRpbk1ldGhvZENvZGVHZW5lcmF0b3IpLCAoaW50cHRy X3QpICgwKSB9IH0sCisjZWxzZQorICAgIHsgMCwgMCwgTm9JbnRyaW5zaWMsIHsgMCwgMCB9IH0s CisjZW5kaWYKKyNpZiBFTkFCTEUoQ29uZGl0aW9uMykKICAgICB7ICJqc0J1aWx0aW5NZXRob2RX aXRoQXJncyIsIEpTQzo6QnVpbHRpbiwgTm9JbnRyaW5zaWMsIHsgKGludHB0cl90KXN0YXRpY19j YXN0PEJ1aWx0aW5HZW5lcmF0b3I+KHRlc3RPYmpKc0J1aWx0aW5NZXRob2RXaXRoQXJnc0NvZGVH ZW5lcmF0b3IpLCAoaW50cHRyX3QpICgzKSB9IH0sCisjZWxzZQorICAgIHsgMCwgMCwgTm9JbnRy aW5zaWMsIHsgMCwgMCB9IH0sCisjZW5kaWYKICAgICB7ICJhZGRFdmVudExpc3RlbmVyIiwgSlND OjpGdW5jdGlvbiwgTm9JbnRyaW5zaWMsIHsgKGludHB0cl90KXN0YXRpY19jYXN0PE5hdGl2ZUZ1 bmN0aW9uPihqc1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlvbkFkZEV2ZW50TGlzdGVuZXIpLCAoaW50 cHRyX3QpICgyKSB9IH0sCiAgICAgeyAicmVtb3ZlRXZlbnRMaXN0ZW5lciIsIEpTQzo6RnVuY3Rp b24sIE5vSW50cmluc2ljLCB7IChpbnRwdHJfdClzdGF0aWNfY2FzdDxOYXRpdmVGdW5jdGlvbj4o anNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25SZW1vdmVFdmVudExpc3RlbmVyKSwgKGludHB0cl90 KSAoMikgfSB9LAogICAgIHsgIndpdGhTY3JpcHRTdGF0ZVZvaWQiLCBKU0M6OkZ1bmN0aW9uLCBO b0ludHJpbnNpYywgeyAoaW50cHRyX3Qpc3RhdGljX2Nhc3Q8TmF0aXZlRnVuY3Rpb24+KGpzVGVz dE9ialByb3RvdHlwZUZ1bmN0aW9uV2l0aFNjcmlwdFN0YXRlVm9pZCksIChpbnRwdHJfdCkgKDAp IH0gfSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9P YmpDL0RPTVRlc3RPYmouaCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9P YmpDL0RPTVRlc3RPYmouaAppbmRleCBmN2I3NjQwODBkYTQyNzU2NGRkYzg2M2M1OWI2YzdkZWZl MThmNjhiLi5mMzIxYTkxYjFiMTRkYzAxNDQxOWViMTU2NWQzY2VjMjYzMGMwNDVkIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvT2JqQy9ET01UZXN0T2Jq LmgKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L09iakMvRE9NVGVz dE9iai5oCkBAIC0xNDUsOCArMTQ1LDYgQEAgV0VCQ09SRV9FWFBPUlQgQGludGVyZmFjZSBET01U ZXN0T2JqIDogRE9NT2JqZWN0CiAtICh2b2lkKW1ldGhvZFdpdGhFeGNlcHRpb247CiAtICh2b2lk KWN1c3RvbU1ldGhvZDsKIC0gKHZvaWQpY3VzdG9tTWV0aG9kV2l0aEFyZ3M6KGludClsb25nQXJn IHN0ckFyZzooTlNTdHJpbmcgKilzdHJBcmcgb2JqQXJnOihET01UZXN0T2JqICopb2JqQXJnOwot LSAodm9pZClqc0J1aWx0aW5NZXRob2Q7Ci0tICh2b2lkKWpzQnVpbHRpbk1ldGhvZFdpdGhBcmdz OihpbnQpbG9uZ0FyZyBzdHJBcmc6KE5TU3RyaW5nICopc3RyQXJnIG9iakFyZzooRE9NVGVzdE9i aiAqKW9iakFyZzsKIC0gKHZvaWQpYWRkRXZlbnRMaXN0ZW5lcjooTlNTdHJpbmcgKil0eXBlIGxp c3RlbmVyOihpZCA8RE9NRXZlbnRMaXN0ZW5lcj4pbGlzdGVuZXIgdXNlQ2FwdHVyZTooQk9PTCl1 c2VDYXB0dXJlOwogLSAodm9pZClyZW1vdmVFdmVudExpc3RlbmVyOihOU1N0cmluZyAqKXR5cGUg bGlzdGVuZXI6KGlkIDxET01FdmVudExpc3RlbmVyPilsaXN0ZW5lciB1c2VDYXB0dXJlOihCT09M KXVzZUNhcHR1cmU7CiAtICh2b2lkKXdpdGhTY3JpcHRTdGF0ZVZvaWQ7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvT2JqQy9ET01UZXN0T2JqLm1tIGIv U291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L09iakMvRE9NVGVzdE9iai5tbQpp bmRleCA1ZWRjNTlkNzNjOGIxY2RmMTFjODQ2OWZhODFlMmFjYTQyMmY2MGYwLi41YTVlYmY1OWQz NTk3YTU2YTA0ZmQzMWEyZDI5NDI1ZmYyN2RmMTIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvT2JqQy9ET01UZXN0T2JqLm1tCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9PYmpDL0RPTVRlc3RPYmoubW0KQEAgLTQ1MCw2 ICs0NTAsNyBAQAogICAgIElNUEwtPnNldEN1c3RvbUF0dHIobmV3Q3VzdG9tQXR0cik7CiB9CiAK KyNpZiBFTkFCTEUoQ29uZGl0aW9uNCkKIC0gKERPTVRlc3RPYmogKilqc0J1aWx0aW5BdHRyaWJ1 dGUKIHsKICAgICBXZWJDb3JlOjpKU01haW5UaHJlYWROdWxsU3RhdGUgc3RhdGU7CkBAIC00NjMs MTIgKzQ2NCwxNSBAQAogCiAgICAgSU1QTC0+c2V0SnNCdWlsdGluQXR0cmlidXRlKGNvcmUobmV3 SnNCdWlsdGluQXR0cmlidXRlKSk7CiB9CisjZW5kaWYKIAorI2lmIEVOQUJMRShDb25kaXRpb240 KQogLSAoRE9NVGVzdE9iaiAqKWpzQnVpbHRpblJlYWRPbmx5QXR0cmlidXRlCiB7CiAgICAgV2Vi Q29yZTo6SlNNYWluVGhyZWFkTnVsbFN0YXRlIHN0YXRlOwogICAgIHJldHVybiBraXQoV1RGOjpn ZXRQdHIoSU1QTC0+anNCdWlsdGluUmVhZE9ubHlBdHRyaWJ1dGUoKSkpOwogfQorI2VuZGlmCiAK IC0gKGludCl3aXRoU2NyaXB0U3RhdGVBdHRyaWJ1dGUKIHsKQEAgLTk3NSwxOCArOTc5LDI2IEBA CiAgICAgSU1QTC0+Y3VzdG9tTWV0aG9kV2l0aEFyZ3MobG9uZ0FyZywgc3RyQXJnLCBjb3JlKG9i akFyZykpOwogfQogCisKKyNpZiBFTkFCTEUoQ29uZGl0aW9uMykKIC0gKHZvaWQpanNCdWlsdGlu TWV0aG9kCiB7CiAgICAgV2ViQ29yZTo6SlNNYWluVGhyZWFkTnVsbFN0YXRlIHN0YXRlOwogICAg IElNUEwtPmpzQnVpbHRpbk1ldGhvZCgpOwogfQogCisjZW5kaWYKKworCisjaWYgRU5BQkxFKENv bmRpdGlvbjMpCiAtICh2b2lkKWpzQnVpbHRpbk1ldGhvZFdpdGhBcmdzOihpbnQpbG9uZ0FyZyBz dHJBcmc6KE5TU3RyaW5nICopc3RyQXJnIG9iakFyZzooRE9NVGVzdE9iaiAqKW9iakFyZwogewog ICAgIFdlYkNvcmU6OkpTTWFpblRocmVhZE51bGxTdGF0ZSBzdGF0ZTsKICAgICBJTVBMLT5qc0J1 aWx0aW5NZXRob2RXaXRoQXJncyhsb25nQXJnLCBzdHJBcmcsIGNvcmUob2JqQXJnKSk7CiB9CiAK KyNlbmRpZgorCiAtICh2b2lkKWFkZEV2ZW50TGlzdGVuZXI6KE5TU3RyaW5nICopdHlwZSBsaXN0 ZW5lcjooaWQgPERPTUV2ZW50TGlzdGVuZXI+KWxpc3RlbmVyIHVzZUNhcHR1cmU6KEJPT0wpdXNl Q2FwdHVyZQogewogICAgIFdlYkNvcmU6OkpTTWFpblRocmVhZE51bGxTdGF0ZSBzdGF0ZTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9UZXN0T2JqLmlk bCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9UZXN0T2JqLmlkbAppbmRl eCBmZGI2NDk2MDIxMTg3ZWEzOTI5MTcyOTVhMWEzN2I3ODBkZWYwODY2Li4zNWQ0NjFmYzQ5YmMy ZmI3MTcyNzNhMjJhYTFmODgyZDljYmU4Y2Q0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9zY3JpcHRzL3Rlc3QvVGVzdE9iai5pZGwKKysrIGIvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3Mvc2NyaXB0cy90ZXN0L1Rlc3RPYmouaWRsCkBAIC0xMTgsMTAgKzExOCwxMCBAQCBlbnVt IF9vcHRpb25hbCB7ICIiLCAiT3B0aW9uYWxWYWx1ZTEiLCAiT3B0aW9uYWxWYWx1ZTIiLCAiT3B0 aW9uYWxWYWx1ZTMiIH07CiAgICAgW0N1c3RvbUJpbmRpbmddIHZvaWQgY3VzdG9tQmluZGluZ01l dGhvZFdpdGhBcmdzKGxvbmcgbG9uZ0FyZywgRE9NU3RyaW5nIHN0ckFyZywgVGVzdE9iaiBvYmpB cmcpOwogCiAgICAgLy8gJ0pTQnVpbHRpbicgZXh0ZW5kZWQgYXR0cmlidXRlCi0gICAgW0pTQnVp bHRpbl0gdm9pZCBqc0J1aWx0aW5NZXRob2QoKTsKLSAgICBbSlNCdWlsdGluXSB2b2lkIGpzQnVp bHRpbk1ldGhvZFdpdGhBcmdzKGxvbmcgbG9uZ0FyZywgRE9NU3RyaW5nIHN0ckFyZywgVGVzdE9i aiBvYmpBcmcpOwotICAgIFtKU0J1aWx0aW5dIGF0dHJpYnV0ZSBUZXN0T2JqIGpzQnVpbHRpbkF0 dHJpYnV0ZTsKLSAgICBbSlNCdWlsdGluXSByZWFkb25seSBhdHRyaWJ1dGUgVGVzdE9iaiBqc0J1 aWx0aW5SZWFkT25seUF0dHJpYnV0ZTsKKyAgICBbQ29uZGl0aW9uYWw9Q29uZGl0aW9uMywgSlNC dWlsdGluXSB2b2lkIGpzQnVpbHRpbk1ldGhvZCgpOworICAgIFtDb25kaXRpb25hbD1Db25kaXRp b24zLCBKU0J1aWx0aW5dIHZvaWQganNCdWlsdGluTWV0aG9kV2l0aEFyZ3MobG9uZyBsb25nQXJn LCBET01TdHJpbmcgc3RyQXJnLCBUZXN0T2JqIG9iakFyZyk7CisgICAgW0NvbmRpdGlvbmFsPUNv bmRpdGlvbjQsIEpTQnVpbHRpbl0gYXR0cmlidXRlIFRlc3RPYmoganNCdWlsdGluQXR0cmlidXRl OworICAgIFtDb25kaXRpb25hbD1Db25kaXRpb240LCBKU0J1aWx0aW5dIHJlYWRvbmx5IGF0dHJp YnV0ZSBUZXN0T2JqIGpzQnVpbHRpblJlYWRPbmx5QXR0cmlidXRlOwogCiAgICAgdm9pZCBhZGRF dmVudExpc3RlbmVyKERPTVN0cmluZyB0eXBlLCBFdmVudExpc3RlbmVyIGxpc3RlbmVyLCBvcHRp b25hbCBib29sZWFuIHVzZUNhcHR1cmUpOwogICAgIHZvaWQgcmVtb3ZlRXZlbnRMaXN0ZW5lcihE T01TdHJpbmcgdHlwZSwgRXZlbnRMaXN0ZW5lciBsaXN0ZW5lciwgb3B0aW9uYWwgYm9vbGVhbiB1 c2VDYXB0dXJlKTsK