130328 2014-03-17 05:49:41 -0700 Fix the !ENABLE(PROMISES) build 2014-03-17 10:29:36 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zsborbely.u-szeged webkit-unassigned commit-queue darin sam oldest_to_newest 991184 0 zsborbely.u-szeged 2014-03-17 05:49:41 -0700 Tested on r165729: $ Tools/Scripts/build-webkit --efl --no-promises build log: /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/runtime/JSPromiseDeferred.cpp: In static member function 'static JSC::JSPromiseDeferred* JSC::JSPromiseDeferred::create(JSC::ExecState*, JSC::JSGlobalObject*)': /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/runtime/JSPromiseDeferred.cpp:45:79: error: 'createDeferredConstructionFunction' was not declared in this scope /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/runtime/JSPromiseDeferred.cpp:47:5: error: 'JSPromise' was not declared in this scope /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/runtime/JSPromiseDeferred.cpp:47:71: error: 'constructPromise' was not declared in this scope /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/runtime/JSPromiseDeferred.cpp:51:66: error: no matching function for call to 'JSC::JSPromiseDeferred::create(JSC::VM&, <unresolved overloaded function type>, JSC::JSValue&, JSC::JSValue&)' /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/runtime/JSPromiseDeferred.cpp:51:66: note: candidates are: /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/runtime/JSPromiseDeferred.cpp:41:20: note: static JSC::JSPromiseDeferred* JSC::JSPromiseDeferred::create(JSC::ExecState*, JSC::JSGlobalObject*) /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/runtime/JSPromiseDeferred.cpp:41:20: note: candidate expects 2 arguments, 4 provided In file included from /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/runtime/JSPromiseDeferred.cpp:27:0: /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/runtime/JSPromiseDeferred.h:39:31: note: static JSC::JSPromiseDeferred* JSC::JSPromiseDeferred::create(JSC::VM&, JSC::JSObject*, JSC::JSValue, JSC::JSValue) /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/runtime/JSPromiseDeferred.h:39:31: note: no known conversion for argument 2 from '<unresolved overloaded function type>' to 'JSC::JSObject*' /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/runtime/JSPromiseDeferred.cpp: In function 'JSC::JSValue JSC::createJSPromiseDeferredFromConstructor(JSC::ExecState*, JSC::JSValue)': /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/runtime/JSPromiseDeferred.cpp:104:94: error: 'createDeferredConstructionFunction' was not declared in this scope /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/runtime/JSPromiseDeferred.cpp: In static member function 'static JSC::JSPromiseDeferred* JSC::JSPromiseDeferred::create(JSC::ExecState*, JSC::JSGlobalObject*)': /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/runtime/JSPromiseDeferred.cpp:52:1: error: control reaches end of non-void function [-Werror=return-type] cc1plus: all warnings being treated as errors ICECC[11086] 04:20:41: Compiled on 10.6.11.36 make[2]: *** [Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/runtime/JSPromiseDeferred.cpp.o] Error 1 make[2]: *** Waiting for unfinished jobs.... /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/runtime/JSGlobalObject.cpp: In member function 'void JSC::JSGlobalObject::reset(JSC::JSValue)': /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/runtime/JSGlobalObject.cpp:392:40: error: incomplete type 'JSC::JSPromiseConstructor' used in nested name specifier /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/runtime/JSGlobalObject.cpp:392:73: error: incomplete type 'JSC::JSPromiseConstructor' used in nested name specifier /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/runtime/JSGlobalObject.cpp:412:99: error: no matching function for call to 'JSC::JSGlobalObject::putDirectWithoutTransition(JSC::VM&, const JSC::Identifier&, JSC::JSPromiseConstructor*, JSC::Attribute)' /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/runtime/JSGlobalObject.cpp:412:99: note: candidate is: In file included from /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/runtime/JSArray.h:26:0, from /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/bytecode/ArrayAllocationProfile.h:30, from /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/runtime/JSGlobalObject.h:25, from /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/runtime/JSGlobalObject.cpp:31: /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/runtime/JSObject.h:1458:13: note: void JSC::JSObject::putDirectWithoutTransition(JSC::VM&, JSC::PropertyName, JSC::JSValue, unsigned int) /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/runtime/JSObject.h:1458:13: note: no known conversion for argument 3 from 'JSC::JSPromiseConstructor*' to 'JSC::JSValue' In file included from /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/runtime/JSCInlines.h:50:0, from /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/runtime/JSGlobalObject.cpp:64: /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/heap/SlotVisitorInlines.h: In instantiation of 'void JSC::SlotVisitor::append(JSC::WriteBarrierBase<T>*) [with T = JSC::JSPromiseConstructor]': /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/runtime/JSGlobalObject.cpp:639:53: required from here /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/heap/SlotVisitorInlines.h:137:5: error: no matching function for call to 'JSC::SlotVisitor::internalAppend(JSC::WriteBarrierBase<JSC::JSPromiseConstructor>*&, JSC::JSPromiseConstructor*&)' /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/heap/SlotVisitorInlines.h:137:5: note: candidates are: /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/heap/SlotVisitorInlines.h:98:48: note: void JSC::SlotVisitor::internalAppend(void*, JSC::JSCell*) /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/heap/SlotVisitorInlines.h:98:48: note: no known conversion for argument 2 from 'JSC::JSPromiseConstructor*' to 'JSC::JSCell*' /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/heap/SlotVisitorInlines.h:91:48: note: void JSC::SlotVisitor::internalAppend(void*, JSC::JSValue) /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/heap/SlotVisitorInlines.h:91:48: note: no known conversion for argument 2 from 'JSC::JSPromiseConstructor*' to 'JSC::JSValue' In file included from /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/heap/Heap.h:40:0, from /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/runtime/WriteBarrier.h:31, from /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/runtime/PropertyStorage.h:29, from /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/runtime/IndexingHeader.h:29, from /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/runtime/ArrayConventions.h:24, from /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/runtime/JSArray.h:24, from /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/bytecode/ArrayAllocationProfile.h:30, from /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/runtime/JSGlobalObject.h:25, from /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/runtime/JSGlobalObject.cpp:31: /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/heap/SlotVisitor.h:128:10: note: void JSC::SlotVisitor::internalAppend(void*, JSC::JSValue*) /home/bzsolt/webkit/EflWebKit/Source/JavaScriptCore/heap/SlotVisitor.h:128:10: note: no known conversion for argument 2 from 'JSC::JSPromiseConstructor*' to 'JSC::JSValue*' ICECC[11003] 04:20:44: Compiled on 10.6.1.14 make[2]: *** [Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/runtime/JSGlobalObject.cpp.o] Error 1 make[1]: *** [Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/all] Error 2 make: *** [all] Error 2 Reason: Missing PROMISES guards. 991186 1 226904 zsborbely.u-szeged 2014-03-17 05:52:02 -0700 Created attachment 226904 Proposed patch 991292 2 226904 commit-queue 2014-03-17 10:29:33 -0700 Comment on attachment 226904 Proposed patch Clearing flags on attachment: 226904 Committed r165741: <http://trac.webkit.org/changeset/165741> 991293 3 commit-queue 2014-03-17 10:29:36 -0700 All reviewed patches have been landed. Closing bug. 226904 2014-03-17 05:52:02 -0700 2014-03-17 10:29:33 -0700 Proposed patch promises.patch text/plain 11047 zsborbely.u-szeged ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IGU2ZTVjNjEuLmI2NWUxNWQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE0LTAzLTE3ICBac29sdCBCb3JiZWx5 ICA8Ym9yYmV6c0BpbmYudS1zemVnZWQuaHU+CisKKyAgICAgICAgRml4IHRoZSAhRU5BQkxFKFBS T01JU0VTKSBidWlsZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTMwMzI4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgQWRkIG1pc3NpbmcgRU5BQkxFKFBST01JU0VTKSBndWFyZHMuCisKKyAgICAgICAgKiBy dW50aW1lL0pTR2xvYmFsT2JqZWN0LmNwcDoKKyAgICAgICAgKEpTQzo6SlNHbG9iYWxPYmplY3Q6 OnJlc2V0KToKKyAgICAgICAgKEpTQzo6SlNHbG9iYWxPYmplY3Q6OnZpc2l0Q2hpbGRyZW4pOgor ICAgICAgICAqIHJ1bnRpbWUvSlNHbG9iYWxPYmplY3QuaDoKKyAgICAgICAgKiBydW50aW1lL0pT UHJvbWlzZURlZmVycmVkLmNwcDoKKyAgICAgICAgKiBydW50aW1lL0pTUHJvbWlzZURlZmVycmVk Lmg6CisgICAgICAgICogcnVudGltZS9KU1Byb21pc2VSZWFjdGlvbi5jcHA6CisgICAgICAgICog cnVudGltZS9KU1Byb21pc2VSZWFjdGlvbi5oOgorICAgICAgICAqIHJ1bnRpbWUvVk0uY3BwOgor ICAgICAgICAoSlNDOjpWTTo6Vk0pOgorICAgICAgICAqIHJ1bnRpbWUvVk0uaDoKKwogMjAxNC0w My0xNiAgQW5kcmVhcyBLbGluZyAgPGFrbGluZ0BhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVT U0lPTihyMTY1NzAzKTogSlNDIHRlc3RzIGNyYXNoaW5nIGluIFN0cmluZ0ltcGw6OmRlc3Ryb3ko KS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTR2xvYmFsT2Jq ZWN0LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTR2xvYmFsT2JqZWN0LmNw cAppbmRleCA4MTIzNjc4Li44ZTk2ZGUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9KU0dsb2JhbE9iamVjdC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvSlNHbG9iYWxPYmplY3QuY3BwCkBAIC0zODksNyArMzg5LDkgQEAgdm9pZCBKU0ds b2JhbE9iamVjdDo6cmVzZXQoSlNWYWx1ZSBwcm90b3R5cGUpCiAgICAgbV9zeW50YXhFcnJvckNv bnN0cnVjdG9yLnNldCh2bSwgdGhpcywgTmF0aXZlRXJyb3JDb25zdHJ1Y3Rvcjo6Y3JlYXRlKHZt LCB0aGlzLCBuYXRpdmVFcnJvclN0cnVjdHVyZSwgbmF0aXZlRXJyb3JQcm90b3R5cGVTdHJ1Y3R1 cmUsIEFTQ0lJTGl0ZXJhbCgiU3ludGF4RXJyb3IiKSkpOwogICAgIG1fdHlwZUVycm9yQ29uc3Ry dWN0b3Iuc2V0KHZtLCB0aGlzLCBOYXRpdmVFcnJvckNvbnN0cnVjdG9yOjpjcmVhdGUodm0sIHRo aXMsIG5hdGl2ZUVycm9yU3RydWN0dXJlLCBuYXRpdmVFcnJvclByb3RvdHlwZVN0cnVjdHVyZSwg QVNDSUlMaXRlcmFsKCJUeXBlRXJyb3IiKSkpOwogICAgIG1fVVJJRXJyb3JDb25zdHJ1Y3Rvci5z ZXQodm0sIHRoaXMsIE5hdGl2ZUVycm9yQ29uc3RydWN0b3I6OmNyZWF0ZSh2bSwgdGhpcywgbmF0 aXZlRXJyb3JTdHJ1Y3R1cmUsIG5hdGl2ZUVycm9yUHJvdG90eXBlU3RydWN0dXJlLCBBU0NJSUxp dGVyYWwoIlVSSUVycm9yIikpKTsKKyNpZiBFTkFCTEUoUFJPTUlTRVMpCiAgICAgbV9wcm9taXNl Q29uc3RydWN0b3Iuc2V0KHZtLCB0aGlzLCBKU1Byb21pc2VDb25zdHJ1Y3Rvcjo6Y3JlYXRlKHZt LCBKU1Byb21pc2VDb25zdHJ1Y3Rvcjo6Y3JlYXRlU3RydWN0dXJlKHZtLCB0aGlzLCBtX2Z1bmN0 aW9uUHJvdG90eXBlLmdldCgpKSwgbV9wcm9taXNlUHJvdG90eXBlLmdldCgpKSk7CisjZW5kaWYK IAogICAgIG1fb2JqZWN0UHJvdG90eXBlLT5wdXREaXJlY3RXaXRob3V0VHJhbnNpdGlvbih2bSwg dm0ucHJvcGVydHlOYW1lcy0+Y29uc3RydWN0b3IsIG9iamVjdENvbnN0cnVjdG9yLCBEb250RW51 bSk7CiAgICAgbV9mdW5jdGlvblByb3RvdHlwZS0+cHV0RGlyZWN0V2l0aG91dFRyYW5zaXRpb24o dm0sIHZtLnByb3BlcnR5TmFtZXMtPmNvbnN0cnVjdG9yLCBmdW5jdGlvbkNvbnN0cnVjdG9yLCBE b250RW51bSk7CkBAIC00MDksNyArNDExLDkgQEAgdm9pZCBKU0dsb2JhbE9iamVjdDo6cmVzZXQo SlNWYWx1ZSBwcm90b3R5cGUpCiAgICAgcHV0RGlyZWN0V2l0aG91dFRyYW5zaXRpb24odm0sIHZt LnByb3BlcnR5TmFtZXMtPlN5bnRheEVycm9yLCBtX3N5bnRheEVycm9yQ29uc3RydWN0b3IuZ2V0 KCksIERvbnRFbnVtKTsKICAgICBwdXREaXJlY3RXaXRob3V0VHJhbnNpdGlvbih2bSwgdm0ucHJv cGVydHlOYW1lcy0+VHlwZUVycm9yLCBtX3R5cGVFcnJvckNvbnN0cnVjdG9yLmdldCgpLCBEb250 RW51bSk7CiAgICAgcHV0RGlyZWN0V2l0aG91dFRyYW5zaXRpb24odm0sIHZtLnByb3BlcnR5TmFt ZXMtPlVSSUVycm9yLCBtX1VSSUVycm9yQ29uc3RydWN0b3IuZ2V0KCksIERvbnRFbnVtKTsKKyNp ZiBFTkFCTEUoUFJPTUlTRVMpCiAgICAgcHV0RGlyZWN0V2l0aG91dFRyYW5zaXRpb24odm0sIHZt LnByb3BlcnR5TmFtZXMtPlByb21pc2UsIG1fcHJvbWlzZUNvbnN0cnVjdG9yLmdldCgpLCBEb250 RW51bSk7CisjZW5kaWYKIAogCiAjZGVmaW5lIFBVVF9DT05TVFJVQ1RPUl9GT1JfU0lNUExFX1RZ UEUoY2FwaXRhbE5hbWUsIGxvd2VyTmFtZSwgcHJvcGVyTmFtZSwgaW5zdGFuY2VUeXBlLCBqc05h bWUpIFwKQEAgLTYzNiw3ICs2NDAsOSBAQCB2b2lkIEpTR2xvYmFsT2JqZWN0Ojp2aXNpdENoaWxk cmVuKEpTQ2VsbCogY2VsbCwgU2xvdFZpc2l0b3ImIHZpc2l0b3IpCiAgICAgdmlzaXRvci5hcHBl bmQoJnRoaXNPYmplY3QtPm1fdHlwZUVycm9yQ29uc3RydWN0b3IpOwogICAgIHZpc2l0b3IuYXBw ZW5kKCZ0aGlzT2JqZWN0LT5tX1VSSUVycm9yQ29uc3RydWN0b3IpOwogICAgIHZpc2l0b3IuYXBw ZW5kKCZ0aGlzT2JqZWN0LT5tX29iamVjdENvbnN0cnVjdG9yKTsKKyNpZiBFTkFCTEUoUFJPTUlT RVMpCiAgICAgdmlzaXRvci5hcHBlbmQoJnRoaXNPYmplY3QtPm1fcHJvbWlzZUNvbnN0cnVjdG9y KTsKKyNlbmRpZgogCiAgICAgdmlzaXRvci5hcHBlbmQoJnRoaXNPYmplY3QtPm1fZXZhbEZ1bmN0 aW9uKTsKICAgICB2aXNpdG9yLmFwcGVuZCgmdGhpc09iamVjdC0+bV9jYWxsRnVuY3Rpb24pOwpk aWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNHbG9iYWxPYmplY3Qu aCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTR2xvYmFsT2JqZWN0LmgKaW5kZXgg YWFiNGE5My4uYTA1MmQ2YSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvSlNHbG9iYWxPYmplY3QuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9K U0dsb2JhbE9iamVjdC5oCkBAIC0xNjQsNyArMTY0LDkgQEAgcHJvdGVjdGVkOgogICAgIFdyaXRl QmFycmllcjxOYXRpdmVFcnJvckNvbnN0cnVjdG9yPiBtX3N5bnRheEVycm9yQ29uc3RydWN0b3I7 CiAgICAgV3JpdGVCYXJyaWVyPE5hdGl2ZUVycm9yQ29uc3RydWN0b3I+IG1fdHlwZUVycm9yQ29u c3RydWN0b3I7CiAgICAgV3JpdGVCYXJyaWVyPE5hdGl2ZUVycm9yQ29uc3RydWN0b3I+IG1fVVJJ RXJyb3JDb25zdHJ1Y3RvcjsKKyNpZiBFTkFCTEUoUFJPTUlTRVMpCiAgICAgV3JpdGVCYXJyaWVy PEpTUHJvbWlzZUNvbnN0cnVjdG9yPiBtX3Byb21pc2VDb25zdHJ1Y3RvcjsKKyNlbmRpZgogICAg IFdyaXRlQmFycmllcjxPYmplY3RDb25zdHJ1Y3Rvcj4gbV9vYmplY3RDb25zdHJ1Y3RvcjsKIAog ICAgIFdyaXRlQmFycmllcjxKU0Z1bmN0aW9uPiBtX2V2YWxGdW5jdGlvbjsKQEAgLTE3Niw3ICsx NzgsOSBAQCBwcm90ZWN0ZWQ6CiAgICAgV3JpdGVCYXJyaWVyPEZ1bmN0aW9uUHJvdG90eXBlPiBt X2Z1bmN0aW9uUHJvdG90eXBlOwogICAgIFdyaXRlQmFycmllcjxBcnJheVByb3RvdHlwZT4gbV9h cnJheVByb3RvdHlwZTsKICAgICBXcml0ZUJhcnJpZXI8UmVnRXhwUHJvdG90eXBlPiBtX3JlZ0V4 cFByb3RvdHlwZTsKKyNpZiBFTkFCTEUoUFJPTUlTRVMpCiAgICAgV3JpdGVCYXJyaWVyPEpTUHJv bWlzZVByb3RvdHlwZT4gbV9wcm9taXNlUHJvdG90eXBlOworI2VuZGlmCiAKICAgICBXcml0ZUJh cnJpZXI8U3RydWN0dXJlPiBtX3dpdGhTY29wZVN0cnVjdHVyZTsKICAgICBXcml0ZUJhcnJpZXI8 U3RydWN0dXJlPiBtX3N0cmljdEV2YWxBY3RpdmF0aW9uU3RydWN0dXJlOwpAQCAtMzUyLDcgKzM1 Niw5IEBAIHB1YmxpYzoKICAgICBOYXRpdmVFcnJvckNvbnN0cnVjdG9yKiBzeW50YXhFcnJvckNv bnN0cnVjdG9yKCkgY29uc3QgeyByZXR1cm4gbV9zeW50YXhFcnJvckNvbnN0cnVjdG9yLmdldCgp OyB9CiAgICAgTmF0aXZlRXJyb3JDb25zdHJ1Y3RvciogdHlwZUVycm9yQ29uc3RydWN0b3IoKSBj b25zdCB7IHJldHVybiBtX3R5cGVFcnJvckNvbnN0cnVjdG9yLmdldCgpOyB9CiAgICAgTmF0aXZl RXJyb3JDb25zdHJ1Y3RvciogVVJJRXJyb3JDb25zdHJ1Y3RvcigpIGNvbnN0IHsgcmV0dXJuIG1f VVJJRXJyb3JDb25zdHJ1Y3Rvci5nZXQoKTsgfQorI2lmIEVOQUJMRShQUk9NSVNFUykKICAgICBK U1Byb21pc2VDb25zdHJ1Y3RvciogcHJvbWlzZUNvbnN0cnVjdG9yKCkgY29uc3QgeyByZXR1cm4g bV9wcm9taXNlQ29uc3RydWN0b3IuZ2V0KCk7IH0KKyNlbmRpZgogCiAgICAgSlNGdW5jdGlvbiog ZXZhbEZ1bmN0aW9uKCkgY29uc3QgeyByZXR1cm4gbV9ldmFsRnVuY3Rpb24uZ2V0KCk7IH0KICAg ICBKU0Z1bmN0aW9uKiBjYWxsRnVuY3Rpb24oKSBjb25zdCB7IHJldHVybiBtX2NhbGxGdW5jdGlv bi5nZXQoKTsgfQpAQCAtMzczLDcgKzM3OSw5IEBAIHB1YmxpYzoKICAgICBEYXRlUHJvdG90eXBl KiBkYXRlUHJvdG90eXBlKCkgY29uc3QgeyByZXR1cm4gbV9kYXRlUHJvdG90eXBlLmdldCgpOyB9 CiAgICAgUmVnRXhwUHJvdG90eXBlKiByZWdFeHBQcm90b3R5cGUoKSBjb25zdCB7IHJldHVybiBt X3JlZ0V4cFByb3RvdHlwZS5nZXQoKTsgfQogICAgIEVycm9yUHJvdG90eXBlKiBlcnJvclByb3Rv dHlwZSgpIGNvbnN0IHsgcmV0dXJuIG1fZXJyb3JQcm90b3R5cGUuZ2V0KCk7IH0KKyNpZiBFTkFC TEUoUFJPTUlTRVMpCiAgICAgSlNQcm9taXNlUHJvdG90eXBlKiBwcm9taXNlUHJvdG90eXBlKCkg Y29uc3QgeyByZXR1cm4gbV9wcm9taXNlUHJvdG90eXBlLmdldCgpOyB9CisjZW5kaWYKIAogICAg IFN0cnVjdHVyZSogd2l0aFNjb3BlU3RydWN0dXJlKCkgY29uc3QgeyByZXR1cm4gbV93aXRoU2Nv cGVTdHJ1Y3R1cmUuZ2V0KCk7IH0KICAgICBTdHJ1Y3R1cmUqIHN0cmljdEV2YWxBY3RpdmF0aW9u U3RydWN0dXJlKCkgY29uc3QgeyByZXR1cm4gbV9zdHJpY3RFdmFsQWN0aXZhdGlvblN0cnVjdHVy ZS5nZXQoKTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNQ cm9taXNlRGVmZXJyZWQuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNQcm9t aXNlRGVmZXJyZWQuY3BwCmluZGV4IGNiYzQyZWIuLjA5ZjUyYjAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTUHJvbWlzZURlZmVycmVkLmNwcAorKysgYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU1Byb21pc2VEZWZlcnJlZC5jcHAKQEAgLTI2LDYg KzI2LDggQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJKU1Byb21pc2VEZWZlcnJl ZC5oIgogCisjaWYgRU5BQkxFKFBST01JU0VTKQorCiAjaW5jbHVkZSAiRXJyb3IuaCIKICNpbmNs dWRlICJKU0NKU1ZhbHVlSW5saW5lcy5oIgogI2luY2x1ZGUgIkpTQ2VsbElubGluZXMuaCIKQEAg LTI0NCwzICsyNDYsNSBAQCBKU1ZhbHVlIGFicnVwdFJlamVjdGlvbihFeGVjU3RhdGUqIGV4ZWMs IEpTUHJvbWlzZURlZmVycmVkKiBkZWZlcnJlZCkKIH0KIAogfSAvLyBuYW1lc3BhY2UgSlNDCisK KyNlbmRpZiAvLyBFTkFCTEUoUFJPTUlTRVMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9KU1Byb21pc2VEZWZlcnJlZC5oIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvSlNQcm9taXNlRGVmZXJyZWQuaAppbmRleCBmZjUwOWQ3Li5kMWM5NzYxIDEwMDY0 NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU1Byb21pc2VEZWZlcnJlZC5o CisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTUHJvbWlzZURlZmVycmVkLmgK QEAgLTI2LDYgKzI2LDggQEAKICNpZm5kZWYgSlNQcm9taXNlRGVmZXJyZWRfaAogI2RlZmluZSBK U1Byb21pc2VEZWZlcnJlZF9oCiAKKyNpZiBFTkFCTEUoUFJPTUlTRVMpCisKICNpbmNsdWRlICJK U0NlbGwuaCIKICNpbmNsdWRlICJTdHJ1Y3R1cmUuaCIKIApAQCAtNzcsNCArNzksNiBAQCBKU1Zh bHVlIGFicnVwdFJlamVjdGlvbihFeGVjU3RhdGUqLCBKU1Byb21pc2VEZWZlcnJlZCopOwogCiB9 IC8vIG5hbWVzcGFjZSBKU0MKIAorI2VuZGlmIC8vIEVOQUJMRShQUk9NSVNFUykKKwogI2VuZGlm IC8vIEpTUHJvbWlzZURlZmVycmVkX2gKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL0pTUHJvbWlzZVJlYWN0aW9uLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9y dW50aW1lL0pTUHJvbWlzZVJlYWN0aW9uLmNwcAppbmRleCA2MjU3OGUxLi4xZDNhYjZmIDEwMDY0 NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU1Byb21pc2VSZWFjdGlvbi5j cHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNQcm9taXNlUmVhY3Rpb24u Y3BwCkBAIC0yNiw2ICsyNiw4IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiSlNQ cm9taXNlUmVhY3Rpb24uaCIKIAorI2lmIEVOQUJMRShQUk9NSVNFUykKKwogI2luY2x1ZGUgIkVy cm9yLmgiCiAjaW5jbHVkZSAiSlNDSlNWYWx1ZUlubGluZXMuaCIKICNpbmNsdWRlICJKU0NlbGxJ bmxpbmVzLmgiCkBAIC0xNTYsMyArMTU4LDUgQEAgdm9pZCBKU1Byb21pc2VSZWFjdGlvbjo6dmlz aXRDaGlsZHJlbihKU0NlbGwqIGNlbGwsIFNsb3RWaXNpdG9yJiB2aXNpdG9yKQogfQogCiB9IC8v IG5hbWVzcGFjZSBKU0MKKworI2VuZGlmIC8vIEVOQUJMRShQUk9NSVNFUykKZGlmZiAtLWdpdCBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTUHJvbWlzZVJlYWN0aW9uLmggYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU1Byb21pc2VSZWFjdGlvbi5oCmluZGV4IGZjNzE0 NmMuLjEyMzU0MjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pT UHJvbWlzZVJlYWN0aW9uLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNQ cm9taXNlUmVhY3Rpb24uaApAQCAtMjYsNiArMjYsOCBAQAogI2lmbmRlZiBKU1Byb21pc2VSZWFj dGlvbl9oCiAjZGVmaW5lIEpTUHJvbWlzZVJlYWN0aW9uX2gKIAorI2lmIEVOQUJMRShQUk9NSVNF UykKKwogI2luY2x1ZGUgIkpTQ2VsbC5oIgogI2luY2x1ZGUgIlN0cnVjdHVyZS5oIgogCkBAIC02 NSw0ICs2Nyw2IEBAIFBhc3NSZWZQdHI8TWljcm90YXNrPiBjcmVhdGVFeGVjdXRlUHJvbWlzZVJl YWN0aW9uTWljcm90YXNrKFZNJiwgSlNQcm9taXNlUmVhY3RpCiAKIH0gLy8gbmFtZXNwYWNlIEpT QwogCisjZW5kaWYgLy8gRU5BQkxFKFBST01JU0VTKQorCiAjZW5kaWYgLy8gSlNQcm9taXNlUmVh Y3Rpb25faApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvVk0uY3Bw IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvVk0uY3BwCmluZGV4IGZmNmZmNDIuLjE2 MzM2ZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1ZNLmNwcAor KysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9WTS5jcHAKQEAgLTI3NCw4ICsyNzQs MTAgQEAgVk06OlZNKFZNVHlwZSB2bVR5cGUsIEhlYXBUeXBlIGhlYXBUeXBlKQogICAgIHByb3Bl cnR5VGFibGVTdHJ1Y3R1cmUuc2V0KCp0aGlzLCBQcm9wZXJ0eVRhYmxlOjpjcmVhdGVTdHJ1Y3R1 cmUoKnRoaXMsIDAsIGpzTnVsbCgpKSk7CiAgICAgbWFwRGF0YVN0cnVjdHVyZS5zZXQoKnRoaXMs IE1hcERhdGE6OmNyZWF0ZVN0cnVjdHVyZSgqdGhpcywgMCwganNOdWxsKCkpKTsKICAgICB3ZWFr TWFwRGF0YVN0cnVjdHVyZS5zZXQoKnRoaXMsIFdlYWtNYXBEYXRhOjpjcmVhdGVTdHJ1Y3R1cmUo KnRoaXMsIDAsIGpzTnVsbCgpKSk7CisjaWYgRU5BQkxFKFBST01JU0VTKQogICAgIHByb21pc2VE ZWZlcnJlZFN0cnVjdHVyZS5zZXQoKnRoaXMsIEpTUHJvbWlzZURlZmVycmVkOjpjcmVhdGVTdHJ1 Y3R1cmUoKnRoaXMsIDAsIGpzTnVsbCgpKSk7CiAgICAgcHJvbWlzZVJlYWN0aW9uU3RydWN0dXJl LnNldCgqdGhpcywgSlNQcm9taXNlUmVhY3Rpb246OmNyZWF0ZVN0cnVjdHVyZSgqdGhpcywgMCwg anNOdWxsKCkpKTsKKyNlbmRpZgogICAgIGl0ZXJhdGlvblRlcm1pbmF0b3Iuc2V0KCp0aGlzLCBK U0ZpbmFsT2JqZWN0OjpjcmVhdGUoKnRoaXMsIEpTRmluYWxPYmplY3Q6OmNyZWF0ZVN0cnVjdHVy ZSgqdGhpcywgMCwganNOdWxsKCksIDEpKSk7CiAgICAgc21hbGxTdHJpbmdzLmluaXRpYWxpemVD b21tb25TdHJpbmdzKCp0aGlzKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvVk0uaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1ZNLmgKaW5kZXgg MWI1ZmY5Mi4uZmZkNDM0NyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvVk0uaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9WTS5oCkBAIC0yODIs OCArMjgyLDEwIEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICBTdHJvbmc8U3RydWN0dXJlPiBw cm9wZXJ0eVRhYmxlU3RydWN0dXJlOwogICAgICAgICBTdHJvbmc8U3RydWN0dXJlPiBtYXBEYXRh U3RydWN0dXJlOwogICAgICAgICBTdHJvbmc8U3RydWN0dXJlPiB3ZWFrTWFwRGF0YVN0cnVjdHVy ZTsKKyNpZiBFTkFCTEUoUFJPTUlTRVMpCiAgICAgICAgIFN0cm9uZzxTdHJ1Y3R1cmU+IHByb21p c2VEZWZlcnJlZFN0cnVjdHVyZTsKICAgICAgICAgU3Ryb25nPFN0cnVjdHVyZT4gcHJvbWlzZVJl YWN0aW9uU3RydWN0dXJlOworI2VuZGlmCiAgICAgICAgIFN0cm9uZzxKU0NlbGw+IGl0ZXJhdGlv blRlcm1pbmF0b3I7CiAKICAgICAgICAgSWRlbnRpZmllclRhYmxlKiBpZGVudGlmaWVyVGFibGU7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cKaW5kZXggODYyNjg1MC4uNzIxMTBlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDE0LTAzLTE3ICBac29sdCBCb3JiZWx5ICA8Ym9yYmV6c0BpbmYudS1zemVnZWQuaHU+ CisKKyAgICAgICAgRml4IHRoZSAhRU5BQkxFKFBST01JU0VTKSBidWlsZAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMwMzI4CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIG1pc3NpbmcgRU5BQkxFKFBS T01JU0VTKSBndWFyZHMuCisKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0RPTVByb21pc2UuY3Bw OgorICAgICAgICAqIGJpbmRpbmdzL2pzL0pTRE9NUHJvbWlzZS5oOgorCiAyMDE0LTAzLTE3ICBE YXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAogICAgICAgICBTdG9wIHVzaW5nIGRlcHJl Y2F0ZWRDaGFyYWN0ZXJzIGluIEhUTUxUcmVlQnVpbGRlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvYmluZGluZ3MvanMvSlNET01Qcm9taXNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL2pzL0pTRE9NUHJvbWlzZS5jcHAKaW5kZXggZmE1YWE5NS4uYzNhNjM3ZiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01Qcm9taXNlLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTVByb21pc2UuY3BwCkBAIC0yNiw2ICsyNiw4IEBA CiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiSlNET01Qcm9taXNlLmgiCiAKKyNpZiBF TkFCTEUoUFJPTUlTRVMpCisKIHVzaW5nIG5hbWVzcGFjZSBKU0M7CiAKIG5hbWVzcGFjZSBXZWJD b3JlIHsKQEAgLTcwLDMgKzcyLDUgQEAgdm9pZCBEZWZlcnJlZFdyYXBwZXI6OnJlamVjdChFeGVj U3RhdGUqIGV4ZWMsIEpTVmFsdWUgcmVhc29uKQogfQogCiB9CisKKyNlbmRpZiAvLyBFTkFCTEUo UFJPTUlTRVMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTVBy b21pc2UuaCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NUHJvbWlzZS5oCmluZGV4 IDY3OThhNDQuLjBkNjU2YzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pz L0pTRE9NUHJvbWlzZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NUHJv bWlzZS5oCkBAIC0yNiw2ICsyNiw4IEBACiAjaWZuZGVmIEpTRE9NUHJvbWlzZV9oCiAjZGVmaW5l IEpTRE9NUHJvbWlzZV9oCiAKKyNpZiBFTkFCTEUoUFJPTUlTRVMpCisKICNpbmNsdWRlICJKU0Ny eXB0b0tleS5oIgogI2luY2x1ZGUgIkpTQ3J5cHRvS2V5UGFpci5oIgogI2luY2x1ZGUgIkpTRE9N QmluZGluZy5oIgpAQCAtMTEzLDQgKzExNSw2IEBAIGlubGluZSB2b2lkIERlZmVycmVkV3JhcHBl cjo6cmVqZWN0PFN0cmluZz4oY29uc3QgU3RyaW5nJiByZXN1bHQpCiAKIH0KIAorI2VuZGlmIC8v IEVOQUJMRShQUk9NSVNFUykKKwogI2VuZGlmIC8vIEpTRE9NUHJvbWlzZV9oCg==