59261 2011-04-22 17:36:13 -0700 Compile error with GCC 4.6.0, tries to assign unsigned& to bitfield 2011-05-04 12:59:48 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 xan.lopez webkit-unassigned eric menard xan.lopez oldest_to_newest 391271 0 xan.lopez 2011-04-22 17:36:13 -0700 When compiling JSC with GCC 4.6.0: CXX Source/JavaScriptCore/API/libJavaScriptCore_la-JSBase.lo In file included from ../../Source/JavaScriptCore/runtime/ScopeChain.h:25:0, from ../../Source/JavaScriptCore/runtime/JSObject.h:35, from ../../Source/JavaScriptCore/runtime/JSArray.h:24, from ../../Source/JavaScriptCore/runtime/JSGlobalObject.h:25, from ../../Source/JavaScriptCore/runtime/JSObjectWithGlobalObject.h:29, from ../../Source/JavaScriptCore/runtime/JSFunction.h:27, from ../../Source/JavaScriptCore/runtime/Executable.h:30, from ../../Source/JavaScriptCore/bytecode/EvalCodeCache.h:32, from ../../Source/JavaScriptCore/bytecode/CodeBlock.h:33, from ../../Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h:33, from ../../Source/JavaScriptCore/jsc.cpp:25: ../../Source/JavaScriptCore/runtime/Structure.h: In static member function ‘static JSC::StructureTransitionTable::Hash::Key JSC::StructureTransitionTable::keyForWeakGCMapFinalizer(void*, JSC::Structure*)’: ../../Source/JavaScriptCore/runtime/Structure.h:301:94: error: cannot bind bitfield ‘structure->JSC::Structure::m_attributesInPrevious’ to ‘unsigned int&’ the reason for this is explained in http://gcc.gnu.org/bugzilla/show_bug.cgi?id=45253, but basically comes down to GCC not being able to fully figure the type of the parameter and defaulting to 'unsigned&', which cannot be assigned to a bitfield. As this seems to be technically correct, and GCC is already doing it, the workaround suggested in the upstream bug report is to use unary '+' to force a proper type detection. The attached patch does this. 391275 1 90814 xan.lopez 2011-04-22 17:41:53 -0700 Created attachment 90814 unaryplus.diff 391405 2 90814 ap 2011-04-22 21:52:14 -0700 Comment on attachment 90814 unaryplus.diff View in context: https://bugs.webkit.org/attachment.cgi?id=90814&action=review > Source/JavaScriptCore/runtime/Structure.cpp:103 > + // Use unary '+' for m_attributesInPrevious to force precise > + // type detection with GCC >= 4.6.0. See > + // https://bugs.webkit.org/show_bug.cgi?id=59261 for more > + // details. Can this be written in one line? > Source/JavaScriptCore/runtime/Structure.cpp:132 > + // Use unary '+' for m_attributesInPrevious to force precise > + // type detection with GCC >= 4.6.0. See > + // https://bugs.webkit.org/show_bug.cgi?id=59261 for more > + // details. Ditto. > Source/JavaScriptCore/runtime/Structure.h:304 > + // Use unary '+' for m_attributesInPrevious to force precise > + // type detection with GCC >= 4.6.0. See > + // https://bugs.webkit.org/show_bug.cgi?id=59261 for more > + // details. Ditto. 392044 3 xan.lopez 2011-04-25 16:20:47 -0700 (In reply to comment #2) > (From update of attachment 90814 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=90814&action=review > > > Source/JavaScriptCore/runtime/Structure.cpp:103 > > + // Use unary '+' for m_attributesInPrevious to force precise > > + // type detection with GCC >= 4.6.0. See > > + // https://bugs.webkit.org/show_bug.cgi?id=59261 for more > > + // details. > > Can this be written in one line? > Wouldn't that be a lot more difficult to read? No other comment in the file seems to do this when they are long-ish. Are you asking because of the weird line-breaks and the bugzilla URL? 392800 4 eric 2011-04-26 15:20:23 -0700 @ap, please r+ or r-. 392811 5 ap 2011-04-26 15:23:59 -0700 static_cast would be my preference, but let's see what Anders or Darin think. 392841 6 90814 andersca 2011-04-26 15:38:12 -0700 Comment on attachment 90814 unaryplus.diff The patch looks correct, but I'd prefer a more generic comment; you'll get this error with any compiler whose standard library has an std::make_pair implementation that takes value references. How about something like: // Newer versions of the STL have an std::make_pair function that takes rvalue references. // When either of the parameters are bitfields, the C++ compiler will try to bind them as lvalues, which is invalid. To work around this, use unary "+" to make the parameter an rvalue. // See https://bugs.webkit.org/show_bug.cgi?id=59261 for more details. 397055 7 92066 menard 2011-05-03 06:21:47 -0700 Created attachment 92066 Patch for landing 397172 8 menard 2011-05-03 10:34:34 -0700 Committed r85621: <http://trac.webkit.org/changeset/85621> 90814 2011-04-22 17:41:53 -0700 2011-05-03 06:21:40 -0700 unaryplus.diff unaryplus.diff text/plain 4880 xan.lopez RnJvbSA0YTYxZWQzODEyMDA4YzczNmViZDg0NjVmY2VhOTE3ZTM4ZmMzYTgwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBYYW4gTG9wZXogPHhsb3BlekBpZ2FsaWEuY29tPgpEYXRlOiBG cmksIDIyIEFwciAyMDExIDE3OjM5OjM3IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gMjAxMS0wNC0y MiAgWGFuIExvcGV6ICA8eGxvcGV6QGlnYWxpYS5jb20+CgogICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgoKICAgICAgICBDb21waWxlIGVycm9yIHdpdGggR0NDIDQuNi4wLCB0cmll cyB0byBhc3NpZ24gdW5zaWduZWQmIHRvIGJpdGZpZWxkCiAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU5MjYxCgogICAgICAgIFVzZSB1bmFyeSAnKycgdG8g Zm9yY2UgcHJvcGVyIHR5cGUgZGV0ZWN0aW9uIGluIHRlbXBsYXRlIGFyZ3VtZW50cwogICAgICAg IHdpdGggR0NDIDQuNi4wLiBTZWUgYnVnIHJlcG9ydCBmb3IgbW9yZSBkZXRhaWxzLgoKICAgICAg ICAqIHJ1bnRpbWUvU3RydWN0dXJlLmNwcDoKICAgICAgICAoSlNDOjpTdHJ1Y3R1cmVUcmFuc2l0 aW9uVGFibGU6OnJlbW92ZSk6IFVzZSAnKycgdG8gZm9yY2UgcHJlY2lzZSB0eXBlIGRldGVjdGlv bi4KICAgICAgICAoSlNDOjpTdHJ1Y3R1cmVUcmFuc2l0aW9uVGFibGU6OmFkZCk6IGRpdHRvLgog ICAgICAgICogcnVudGltZS9TdHJ1Y3R1cmUuaDoKICAgICAgICAoSlNDOjpTdHJ1Y3R1cmVUcmFu c2l0aW9uVGFibGU6OmtleUZvcldlYWtHQ01hcEZpbmFsaXplcik6IGRpdHRvLgotLS0KIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgfCAgIDE2ICsrKysrKysrKysr KysrKysKIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1N0cnVjdHVyZS5jcHAgfCAgIDE0 ICsrKysrKysrKysrKy0tCiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9TdHJ1Y3R1cmUu aCAgIHwgICAgNiArKysrKy0KIDMgZmlsZXMgY2hhbmdlZCwgMzMgaW5zZXJ0aW9ucygrKSwgMyBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9n IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBmMzJlZTYzLi45ZGNlNmIy IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTIsNiArMiwyMiBAQAogCiAgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgogCisgICAgICAgIENvbXBpbGUgZXJyb3Igd2l0aCBH Q0MgNC42LjAsIHRyaWVzIHRvIGFzc2lnbiB1bnNpZ25lZCYgdG8gYml0ZmllbGQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU5MjYxCisKKyAgICAgICAg VXNlIHVuYXJ5ICcrJyB0byBmb3JjZSBwcm9wZXIgdHlwZSBkZXRlY3Rpb24gaW4gdGVtcGxhdGUg YXJndW1lbnRzCisgICAgICAgIHdpdGggR0NDIDQuNi4wLiBTZWUgYnVnIHJlcG9ydCBmb3IgbW9y ZSBkZXRhaWxzLgorCisgICAgICAgICogcnVudGltZS9TdHJ1Y3R1cmUuY3BwOgorICAgICAgICAo SlNDOjpTdHJ1Y3R1cmVUcmFuc2l0aW9uVGFibGU6OnJlbW92ZSk6IFVzZSAnKycgdG8gZm9yY2Ug cHJlY2lzZSB0eXBlIGRldGVjdGlvbi4KKyAgICAgICAgKEpTQzo6U3RydWN0dXJlVHJhbnNpdGlv blRhYmxlOjphZGQpOiBkaXR0by4KKyAgICAgICAgKiBydW50aW1lL1N0cnVjdHVyZS5oOgorICAg ICAgICAoSlNDOjpTdHJ1Y3R1cmVUcmFuc2l0aW9uVGFibGU6OmtleUZvcldlYWtHQ01hcEZpbmFs aXplcik6IGRpdHRvLgorCisyMDExLTA0LTIyICBYYW4gTG9wZXogIDx4bG9wZXpAaWdhbGlhLmNv bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwogICAgICAgICBVc2Ug bmF0aXZlIE51bGxQdHIgd2hlbiB1c2luZyBHQ0MgNC42LjAgYW5kIEMrKzB4CiAgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01OTI1MgogCmRpZmYgLS1naXQg YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9TdHJ1Y3R1cmUuY3BwIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvU3RydWN0dXJlLmNwcAppbmRleCA3YWFiZjAwLi5jNTE3OTFi IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9TdHJ1Y3R1cmUuY3Bw CisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1N0cnVjdHVyZS5jcHAKQEAgLTk2 LDcgKzk2LDEyIEBAIGlubGluZSB2b2lkIFN0cnVjdHVyZVRyYW5zaXRpb25UYWJsZTo6cmVtb3Zl KFN0cnVjdHVyZSogc3RydWN0dXJlKQogICAgICAgICAvLyBDaGVjayB3aGV0aGVyIGEgbWFwcGlu ZyBleGlzdHMgZm9yIHN0cnVjdHVyZSdzIGtleSwgYW5kIHdoZXRoZXIgdGhlCiAgICAgICAgIC8v IGVudHJ5IGlzIHN0cnVjdHVyZSAodGhlIGxhdHRlciBjaGVjayBtYXkgZmFpbCBpZiB3ZSBpbml0 aWFsbHkgaGFkIGEKICAgICAgICAgLy8gdHJhbnNpdGlvbiB3aXRoIGEgc3BlY2lmaWMgdmFsdWUs IGFuZCB0aGlzIGhhcyBiZWVuIGRlc3BlY2lmaWVkKS4KLSAgICAgICAgVHJhbnNpdGlvbk1hcDo6 aXRlcmF0b3IgZW50cnkgPSBtYXAoKS0+ZmluZChtYWtlX3BhaXIoc3RydWN0dXJlLT5tX25hbWVJ blByZXZpb3VzLCBzdHJ1Y3R1cmUtPm1fYXR0cmlidXRlc0luUHJldmlvdXMpKTsKKworICAgICAg ICAvLyBVc2UgdW5hcnkgJysnIGZvciBtX2F0dHJpYnV0ZXNJblByZXZpb3VzIHRvIGZvcmNlIHBy ZWNpc2UKKyAgICAgICAgLy8gdHlwZSBkZXRlY3Rpb24gd2l0aCBHQ0MgPj0gNC42LjAuIFNlZQor ICAgICAgICAvLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTkyNjEg Zm9yIG1vcmUKKyAgICAgICAgLy8gZGV0YWlscy4KKyAgICAgICAgVHJhbnNpdGlvbk1hcDo6aXRl cmF0b3IgZW50cnkgPSBtYXAoKS0+ZmluZChtYWtlX3BhaXIoc3RydWN0dXJlLT5tX25hbWVJblBy ZXZpb3VzLCArc3RydWN0dXJlLT5tX2F0dHJpYnV0ZXNJblByZXZpb3VzKSk7CiAgICAgICAgIGlm IChlbnRyeSAhPSBtYXAoKS0+ZW5kKCkgJiYgc3RydWN0dXJlID09IGVudHJ5LmdldCgpLnNlY29u ZCkKICAgICAgICAgICAgIG1hcCgpLT5yZW1vdmUoZW50cnkpOwogICAgIH0KQEAgLTEyMCw3ICsx MjUsMTIgQEAgaW5saW5lIHZvaWQgU3RydWN0dXJlVHJhbnNpdGlvblRhYmxlOjphZGQoSlNHbG9i YWxEYXRhJiBnbG9iYWxEYXRhLCBTdHJ1Y3R1cmUqIHMKICAgICB9CiAKICAgICAvLyBBZGQgdGhl IHN0cnVjdHVyZSB0byB0aGUgbWFwLgotICAgIHN0ZDo6cGFpcjxUcmFuc2l0aW9uTWFwOjppdGVy YXRvciwgYm9vbD4gcmVzdWx0ID0gbWFwKCktPmFkZChnbG9iYWxEYXRhLCBtYWtlX3BhaXIoc3Ry dWN0dXJlLT5tX25hbWVJblByZXZpb3VzLCBzdHJ1Y3R1cmUtPm1fYXR0cmlidXRlc0luUHJldmlv dXMpLCBzdHJ1Y3R1cmUpOworCisgICAgLy8gVXNlIHVuYXJ5ICcrJyBmb3IgbV9hdHRyaWJ1dGVz SW5QcmV2aW91cyB0byBmb3JjZSBwcmVjaXNlCisgICAgLy8gdHlwZSBkZXRlY3Rpb24gd2l0aCBH Q0MgPj0gNC42LjAuIFNlZQorICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD01OTI2MSBmb3IgbW9yZQorICAgIC8vIGRldGFpbHMuCisgICAgc3RkOjpwYWlyPFRy YW5zaXRpb25NYXA6Oml0ZXJhdG9yLCBib29sPiByZXN1bHQgPSBtYXAoKS0+YWRkKGdsb2JhbERh dGEsIG1ha2VfcGFpcihzdHJ1Y3R1cmUtPm1fbmFtZUluUHJldmlvdXMsICtzdHJ1Y3R1cmUtPm1f YXR0cmlidXRlc0luUHJldmlvdXMpLCBzdHJ1Y3R1cmUpOwogICAgIGlmICghcmVzdWx0LnNlY29u ZCkgewogICAgICAgICAvLyBUaGVyZSBhbHJlYWR5IGlzIGFuIGVudHJ5ISAtIHdlIHNob3VsZCBv bmx5IGhpdCB0aGlzIHdoZW4gZGVzcGVjaWZ5aW5nLgogICAgICAgICBBU1NFUlQocmVzdWx0LmZp cnN0LmdldCgpLnNlY29uZC0+bV9zcGVjaWZpY1ZhbHVlSW5QcmV2aW91cyk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9TdHJ1Y3R1cmUuaCBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL1N0cnVjdHVyZS5oCmluZGV4IDI3MDY1YTguLjQ3ODVmNDkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1N0cnVjdHVyZS5oCisrKyBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1N0cnVjdHVyZS5oCkBAIC0yOTgsNyArMjk4 LDExIEBAIG5hbWVzcGFjZSBKU0MgewogCiAgICAgaW5saW5lIFN0cnVjdHVyZVRyYW5zaXRpb25U YWJsZTo6SGFzaDo6S2V5IFN0cnVjdHVyZVRyYW5zaXRpb25UYWJsZTo6a2V5Rm9yV2Vha0dDTWFw RmluYWxpemVyKHZvaWQqLCBTdHJ1Y3R1cmUqIHN0cnVjdHVyZSkKICAgICB7Ci0gICAgICAgIHJl dHVybiBIYXNoOjpLZXkoc3RydWN0dXJlLT5tX25hbWVJblByZXZpb3VzLmdldCgpLCBzdHJ1Y3R1 cmUtPm1fYXR0cmlidXRlc0luUHJldmlvdXMpOworICAgICAgICAvLyBVc2UgdW5hcnkgJysnIGZv ciBtX2F0dHJpYnV0ZXNJblByZXZpb3VzIHRvIGZvcmNlIHByZWNpc2UKKyAgICAgICAgLy8gdHlw ZSBkZXRlY3Rpb24gd2l0aCBHQ0MgPj0gNC42LjAuIFNlZQorICAgICAgICAvLyBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTkyNjEgZm9yIG1vcmUKKyAgICAgICAgLy8g ZGV0YWlscy4KKyAgICAgICAgcmV0dXJuIEhhc2g6OktleShzdHJ1Y3R1cmUtPm1fbmFtZUluUHJl dmlvdXMuZ2V0KCksICtzdHJ1Y3R1cmUtPm1fYXR0cmlidXRlc0luUHJldmlvdXMpOwogICAgIH0K IAogfSAvLyBuYW1lc3BhY2UgSlNDCi0tIAoxLjcuNC40Cgo= 92066 2011-05-03 06:21:47 -0700 2011-05-03 10:24:10 -0700 Patch for landing bug-59261-20110503102147.patch text/plain 4252 menard SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gODU1OTcpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAK KzIwMTEtMDUtMDMgIFhhbiBMb3BleiAgPHhsb3BlekBpZ2FsaWEuY29tPgorCisgICAgICAgIFJl dmlld2VkIGJ5IEFuZGVycyBDYXJsc3Nvbi4KKworICAgICAgICBDb21waWxlIGVycm9yIHdpdGgg R0NDIDQuNi4wLCB0cmllcyB0byBhc3NpZ24gdW5zaWduZWQmIHRvIGJpdGZpZWxkCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01OTI2MQorCisgICAgICAg IFVzZSB1bmFyeSAnKycgdG8gZm9yY2UgcHJvcGVyIHR5cGUgZGV0ZWN0aW9uIGluIHRlbXBsYXRl IGFyZ3VtZW50cworICAgICAgICB3aXRoIEdDQyA0LjYuMC4gU2VlIGJ1ZyByZXBvcnQgZm9yIG1v cmUgZGV0YWlscy4KKworICAgICAgICAqIHJ1bnRpbWUvU3RydWN0dXJlLmNwcDoKKyAgICAgICAg KEpTQzo6U3RydWN0dXJlVHJhbnNpdGlvblRhYmxlOjpyZW1vdmUpOiBVc2UgJysnIHRvIGZvcmNl IHByZWNpc2UgdHlwZSBkZXRlY3Rpb24uCisgICAgICAgIChKU0M6OlN0cnVjdHVyZVRyYW5zaXRp b25UYWJsZTo6YWRkKTogZGl0dG8uCisgICAgICAgICogcnVudGltZS9TdHJ1Y3R1cmUuaDoKKyAg ICAgICAgKEpTQzo6U3RydWN0dXJlVHJhbnNpdGlvblRhYmxlOjprZXlGb3JXZWFrR0NNYXBGaW5h bGl6ZXIpOiBkaXR0by4KKwogMjAxMS0wNS0wMiAgSmVzc2llIEJlcmxpbiAgPGpiZXJsaW5AYXBw bGUuY29tPgogCiAgICAgICAgIFJ1YmJlci1zdGFtcGVkIGJ5IE9saXZlciBIdW50LgpJbmRleDog U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU3RydWN0dXJlLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9TdHJ1Y3R1cmUuY3BwCShyZXZpc2lvbiA4 NTU5NykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1N0cnVjdHVyZS5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTk2LDcgKzk2LDExIEBAIGlubGluZSB2b2lkIFN0cnVjdHVyZVRyYW5z aXRpb25UYWJsZTo6cmUKICAgICAgICAgLy8gQ2hlY2sgd2hldGhlciBhIG1hcHBpbmcgZXhpc3Rz IGZvciBzdHJ1Y3R1cmUncyBrZXksIGFuZCB3aGV0aGVyIHRoZQogICAgICAgICAvLyBlbnRyeSBp cyBzdHJ1Y3R1cmUgKHRoZSBsYXR0ZXIgY2hlY2sgbWF5IGZhaWwgaWYgd2UgaW5pdGlhbGx5IGhh ZCBhCiAgICAgICAgIC8vIHRyYW5zaXRpb24gd2l0aCBhIHNwZWNpZmljIHZhbHVlLCBhbmQgdGhp cyBoYXMgYmVlbiBkZXNwZWNpZmllZCkuCi0gICAgICAgIFRyYW5zaXRpb25NYXA6Oml0ZXJhdG9y IGVudHJ5ID0gbWFwKCktPmZpbmQobWFrZV9wYWlyKHN0cnVjdHVyZS0+bV9uYW1lSW5QcmV2aW91 cywgc3RydWN0dXJlLT5tX2F0dHJpYnV0ZXNJblByZXZpb3VzKSk7CisKKyAgICAgICAgLy8gTmV3 ZXIgdmVyc2lvbnMgb2YgdGhlIFNUTCBoYXZlIGFuIHN0ZDo6bWFrZV9wYWlyIGZ1bmN0aW9uIHRo YXQgdGFrZXMgcnZhbHVlIHJlZmVyZW5jZXMuCisgICAgICAgIC8vIFdoZW4gZWl0aGVyIG9mIHRo ZSBwYXJhbWV0ZXJzIGFyZSBiaXRmaWVsZHMsIHRoZSBDKysgY29tcGlsZXIgd2lsbCB0cnkgdG8g YmluZCB0aGVtIGFzIGx2YWx1ZXMsIHdoaWNoIGlzIGludmFsaWQuIFRvIHdvcmsgYXJvdW5kIHRo aXMsIHVzZSB1bmFyeSAiKyIgdG8gbWFrZSB0aGUgcGFyYW1ldGVyIGFuIHJ2YWx1ZS4KKyAgICAg ICAgLy8gU2VlIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01OTI2MSBm b3IgbW9yZSBkZXRhaWxzCisgICAgICAgIFRyYW5zaXRpb25NYXA6Oml0ZXJhdG9yIGVudHJ5ID0g bWFwKCktPmZpbmQobWFrZV9wYWlyKHN0cnVjdHVyZS0+bV9uYW1lSW5QcmV2aW91cywgK3N0cnVj dHVyZS0+bV9hdHRyaWJ1dGVzSW5QcmV2aW91cykpOwogICAgICAgICBpZiAoZW50cnkgIT0gbWFw KCktPmVuZCgpICYmIHN0cnVjdHVyZSA9PSBlbnRyeS5nZXQoKS5zZWNvbmQpCiAgICAgICAgICAg ICBtYXAoKS0+cmVtb3ZlKGVudHJ5KTsKICAgICB9CkBAIC0xMjAsNyArMTI0LDExIEBAIGlubGlu ZSB2b2lkIFN0cnVjdHVyZVRyYW5zaXRpb25UYWJsZTo6YWQKICAgICB9CiAKICAgICAvLyBBZGQg dGhlIHN0cnVjdHVyZSB0byB0aGUgbWFwLgotICAgIHN0ZDo6cGFpcjxUcmFuc2l0aW9uTWFwOjpp dGVyYXRvciwgYm9vbD4gcmVzdWx0ID0gbWFwKCktPmFkZChnbG9iYWxEYXRhLCBtYWtlX3BhaXIo c3RydWN0dXJlLT5tX25hbWVJblByZXZpb3VzLCBzdHJ1Y3R1cmUtPm1fYXR0cmlidXRlc0luUHJl dmlvdXMpLCBzdHJ1Y3R1cmUpOworCisgICAgLy8gTmV3ZXIgdmVyc2lvbnMgb2YgdGhlIFNUTCBo YXZlIGFuIHN0ZDo6bWFrZV9wYWlyIGZ1bmN0aW9uIHRoYXQgdGFrZXMgcnZhbHVlIHJlZmVyZW5j ZXMuCisgICAgLy8gV2hlbiBlaXRoZXIgb2YgdGhlIHBhcmFtZXRlcnMgYXJlIGJpdGZpZWxkcywg dGhlIEMrKyBjb21waWxlciB3aWxsIHRyeSB0byBiaW5kIHRoZW0gYXMgbHZhbHVlcywgd2hpY2gg aXMgaW52YWxpZC4gVG8gd29yayBhcm91bmQgdGhpcywgdXNlIHVuYXJ5ICIrIiB0byBtYWtlIHRo ZSBwYXJhbWV0ZXIgYW4gcnZhbHVlLgorICAgIC8vIFNlZSBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NTkyNjEgZm9yIG1vcmUgZGV0YWlscworICAgIHN0ZDo6cGFpcjxU cmFuc2l0aW9uTWFwOjppdGVyYXRvciwgYm9vbD4gcmVzdWx0ID0gbWFwKCktPmFkZChnbG9iYWxE YXRhLCBtYWtlX3BhaXIoc3RydWN0dXJlLT5tX25hbWVJblByZXZpb3VzLCArc3RydWN0dXJlLT5t X2F0dHJpYnV0ZXNJblByZXZpb3VzKSwgc3RydWN0dXJlKTsKICAgICBpZiAoIXJlc3VsdC5zZWNv bmQpIHsKICAgICAgICAgLy8gVGhlcmUgYWxyZWFkeSBpcyBhbiBlbnRyeSEgLSB3ZSBzaG91bGQg b25seSBoaXQgdGhpcyB3aGVuIGRlc3BlY2lmeWluZy4KICAgICAgICAgQVNTRVJUKHJlc3VsdC5m aXJzdC5nZXQoKS5zZWNvbmQtPm1fc3BlY2lmaWNWYWx1ZUluUHJldmlvdXMpOwpJbmRleDogU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU3RydWN0dXJlLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU3RydWN0dXJlLmgJKHJldmlzaW9uIDg1NTk3KQor KysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU3RydWN0dXJlLmgJKHdvcmtpbmcgY29w eSkKQEAgLTMwMiw3ICszMDIsMTAgQEAgbmFtZXNwYWNlIEpTQyB7CiAKICAgICBpbmxpbmUgU3Ry dWN0dXJlVHJhbnNpdGlvblRhYmxlOjpIYXNoOjpLZXkgU3RydWN0dXJlVHJhbnNpdGlvblRhYmxl OjprZXlGb3JXZWFrR0NNYXBGaW5hbGl6ZXIodm9pZCosIFN0cnVjdHVyZSogc3RydWN0dXJlKQog ICAgIHsKLSAgICAgICAgcmV0dXJuIEhhc2g6OktleShzdHJ1Y3R1cmUtPm1fbmFtZUluUHJldmlv dXMuZ2V0KCksIHN0cnVjdHVyZS0+bV9hdHRyaWJ1dGVzSW5QcmV2aW91cyk7CisgICAgICAgIC8v IE5ld2VyIHZlcnNpb25zIG9mIHRoZSBTVEwgaGF2ZSBhbiBzdGQ6Om1ha2VfcGFpciBmdW5jdGlv biB0aGF0IHRha2VzIHJ2YWx1ZSByZWZlcmVuY2VzLgorICAgICAgICAvLyBXaGVuIGVpdGhlciBv ZiB0aGUgcGFyYW1ldGVycyBhcmUgYml0ZmllbGRzLCB0aGUgQysrIGNvbXBpbGVyIHdpbGwgdHJ5 IHRvIGJpbmQgdGhlbSBhcyBsdmFsdWVzLCB3aGljaCBpcyBpbnZhbGlkLiBUbyB3b3JrIGFyb3Vu ZCB0aGlzLCB1c2UgdW5hcnkgIisiIHRvIG1ha2UgdGhlIHBhcmFtZXRlciBhbiBydmFsdWUuCisg ICAgICAgIC8vIFNlZSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTky NjEgZm9yIG1vcmUgZGV0YWlscy4KKyAgICAgICAgcmV0dXJuIEhhc2g6OktleShzdHJ1Y3R1cmUt Pm1fbmFtZUluUHJldmlvdXMuZ2V0KCksICtzdHJ1Y3R1cmUtPm1fYXR0cmlidXRlc0luUHJldmlv dXMpOwogICAgIH0KIAogfSAvLyBuYW1lc3BhY2UgSlNDCg==