53620 2011-02-02 13:05:50 -0800 GCC compiler on ARM issues bogus warnings and fails to compile. 2011-02-14 09:32:19 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 53808 1 dglazkov dglazkov buildbot commit-queue darin dglazkov eric koivisto levin webkit.review.bot oldest_to_newest 344158 0 dglazkov 2011-02-02 13:05:50 -0800 GCC compiler on ARM issues bogus warnings and fails to compile. 344160 1 80955 dglazkov 2011-02-02 13:06:39 -0800 Created attachment 80955 Patch 344173 2 dglazkov 2011-02-02 13:23:11 -0800 Here's an example from http://build.chromium.org/p/chromium/builders/Arm/builds/4693/steps/compile/logs/stdio: cc1plus: warnings being treated as errors third_party/WebKit/Source/WebCore/css/CSSPrimitiveValue.cpp: In static member function 'static WTF::PassRefPtr<WebCore::CSSPrimitiveValue> WebCore::CSSPrimitiveValue::createColor(unsigned int)': third_party/WebKit/Source/WebCore/css/CSSPrimitiveValue.cpp:130: error: 'colorTransparent.unstatic.4909' may be used uninitialized in this function 344174 3 80955 eric 2011-02-02 13:23:11 -0800 Comment on attachment 80955 Patch Please link to the GCC bug url both in the ChangeLog and the actual code change. The ChangeLog should give an example of the warning and explain better what we're doing here. 344177 4 eric 2011-02-02 13:24:29 -0800 Is it possible to also just disable that warning on the arm build? The code change is an OK approach, but I wonder if there is a nicer hack for ARM? We could also encase the added code in an ARM #ifdef? 344179 5 eric 2011-02-02 13:25:28 -0800 My main goal here is to make the code you're adding easily self-documenting as to when it can be removed. Currently what you're adding can never be removed for fear of breaking some obscure compiler that I don't have access to. You should better document (ideally through #ifdefs and bug links) when it can be removed. 344210 6 dglazkov 2011-02-02 13:49:18 -0800 Compiler: gcc (Ubuntu 4.4.3-4ubuntu5) 4.4.3 344215 7 dglazkov 2011-02-02 13:56:15 -0800 (In reply to comment #5) > My main goal here is to make the code you're adding easily self-documenting as to when it can be removed. Currently what you're adding can never be removed for fear of breaking some obscure compiler that I don't have access to. You should better document (ideally through #ifdefs and bug links) when it can be removed. I like the idea of the ifdefs. I'll ask nsylvain to try it on the device. 344299 8 dglazkov 2011-02-02 15:12:30 -0800 (In reply to comment #4) > Is it possible to also just disable that warning on the arm build? The code change is an OK approach, but I wonder if there is a nicer hack for ARM? > > We could also encase the added code in an ARM #ifdef? The warning is explicitly disabled. I double-checked. Here's the spew from make V=1 for the CSSPrimitiveValue. If you search for it, the -Wno-uninitialized is there: /usr/local/crosstool-trusted/arm-2009q3/bin/arm-none-linux-gnueabi-g++ -B/usr/local/tot-binutils/arm-none-linux-gnueabi/bin '-DNO_TCMALLOC' '-DNO_HEAPCHECKER' '-DDISABLE_NACL' '-DCHROMIUM_BUILD' '-DTOOLKIT_VIEWS=1' '-DOS_CHROMEOS=1' '-DENABLE_REMOTING=1' '-DENABLE_FLAPPER_HACKS=1' '-DENABLE_GPU=1' '-DWEBCORE_NAVIGATOR_VENDOR="Google Inc."' '-DENABLE_3D_CANVAS=1' '-DENABLE_3D_PLUGIN=1' '-DENABLE_BLOB=1' '-DENABLE_BLOB_SLICE=1' '-DENABLE_CHANNEL_MESSAGING=1' '-DENABLE_CLIENT_BASED_GEOLOCATION=1' '-DENABLE_DASHBOARD_SUPPORT=0' '-DENABLE_DATABASE=1' '-DENABLE_DATAGRID=0' '-DENABLE_DEVICE_ORIENTATION=1' '-DENABLE_DIRECTORY_UPLOAD=1' '-DENABLE_DOM_STORAGE=1' '-DENABLE_EVENTSOURCE=1' '-DENABLE_FILE_SYSTEM=1' '-DENABLE_FILTERS=1' '-DENABLE_GEOLOCATION=1' '-DENABLE_ICONDATABASE=0' '-DENABLE_INDEXED_DATABASE=1' '-DENABLE_INPUT_SPEECH=1' '-DENABLE_JAVASCRIPT_DEBUGGER=1' '-DENABLE_JSC_MULTIPLE_THREADS=0' '-DENABLE_LINK_PREFETCH=1' '-DENABLE_METER_TAG=1' '-DENABLE_NOTIFICATIONS=1' '-DENABLE_OFFLINE_WEB_APPLICATIONS=1' '-DENABLE_OPENTYPE_SANITIZER=1' '-DENABLE_ORIENTATION_EVENTS=0' '-DENABLE_PROGRESS_TAG=1' '-DENABLE_REQUEST_ANIMATION_FRAME=1' '-DENABLE_RUBY=1' '-DENABLE_SANDBOX=1' '-DENABLE_SHARED_WORKERS=1' '-DENABLE_SVG=1' '-DENABLE_SVG_ANIMATION=1' '-DENABLE_SVG_AS_IMAGE=1' '-DENABLE_SVG_FONTS=1' '-DENABLE_SVG_FOREIGN_OBJECT=1' '-DENABLE_SVG_USE=1' '-DENABLE_TOUCH_EVENTS=1' '-DENABLE_V8_SCRIPT_DEBUG_SERVER=1' '-DENABLE_VIDEO=1' '-DENABLE_WEB_SOCKETS=1' '-DENABLE_WEB_TIMING=1' '-DENABLE_WEBGL=1' '-DENABLE_WORKERS=1' '-DENABLE_XHR_RESPONSE_BLOB=1' '-DENABLE_XPATH=1' '-DENABLE_XSLT=1' '-DWTF_USE_WEBP=1' '-DWTF_USE_WEBKIT_IMAGE_DECODERS=1' '-DWTF_USE_ACCELERATED_COMPOSITING=1' '-DENABLE_3D_RENDERING=1' '-DENABLE_ACCELERATED_2D_CANVAS=1' '-DBUILDING_CHROMIUM__=1' '-DUSE_SYSTEM_MALLOC=1' '-DWTF_USE_PTHREADS=1' '-DU_STATIC_IMPLEMENTATION' '-DSK_BUILD_NO_IMAGE_ENCODE' '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' '-DGR_SKIP_2POINTRADIAL_PROGRAMS' '-DUSE_SYSTEM_LIBPNG' '-DLIBXML_STATIC' '-DLIBXSLT_STATIC' '-DUSE_SYSTEM_LIBJPEG' '-D__STDC_FORMAT_MACROS' '-DNDEBUG' '-DNVALGRIND' '-DDYNAMIC_ANNOTATIONS_ENABLED=0' -Ithird_party/icu/public/common -Ithird_party/icu/public/i18n -Igpu -Iout/Release/obj.target/geni -Ithird_party/WebKit/Source/WebCore -Ithird_party/WebKit/Source/WebCore/accessibility -Ithird_party/WebKit/Source/WebCore/accessibility/chromium -Ithird_party/WebKit/Source/WebCore/bindings -Ithird_party/WebKit/Source/WebCore/bindings/generic -Ithird_party/WebKit/Source/WebCore/bindings/v8 -Ithird_party/WebKit/Source/WebCore/bindings/v8/custom -Ithird_party/WebKit/Source/WebCore/bindings/v8/specialization -Ithird_party/WebKit/Source/WebCore/css -Ithird_party/WebKit/Source/WebCore/dom -Ithird_party/WebKit/Source/WebCore/dom/default -Ithird_party/WebKit/Source/WebCore/editing -Ithird_party/WebKit/Source/WebCore/fileapi -Ithird_party/WebKit/Source/WebCore/history -Ithird_party/WebKit/Source/WebCore/html -Ithird_party/WebKit/Source/WebCore/html/canvas -Ithird_party/WebKit/Source/WebCore/html/parser -Ithird_party/WebKit/Source/WebCore/html/shadow -Ithird_party/WebKit/Source/WebCore/inspector -Ithird_party/WebKit/Source/WebCore/loader -Ithird_party/WebKit/Source/WebCore/loader/appcache -Ithird_party/WebKit/Source/WebCore/loader/archive -Ithird_party/WebKit/Source/WebCore/loader/cache -Ithird_party/WebKit/Source/WebCore/loader/icon -Ithird_party/WebKit/Source/WebCore/mathml -Ithird_party/WebKit/Source/WebCore/notifications -Ithird_party/WebKit/Source/WebCore/page -Ithird_party/WebKit/Source/WebCore/page/animation -Ithird_party/WebKit/Source/WebCore/page/chromium -Ithird_party/WebKit/Source/WebCore/platform -Ithird_party/WebKit/Source/WebCore/platform/animation -Ithird_party/WebKit/Source/WebCore/platform/audio -Ithird_party/WebKit/Source/WebCore/platform/audio/chromium -Ithird_party/WebKit/Source/WebCore/platform/chromium -Ithird_party/WebKit/Source/WebCore/platform/graphics -Ithird_party/WebKit/Source/WebCore/platform/graphics/chromium -Ithird_party/WebKit/Source/WebCore/platform/graphics/filters -Ithird_party/WebKit/Source/WebCore/platform/graphics/gpu -Ithird_party/WebKit/Source/WebCore/platform/graphics/opentype -Ithird_party/WebKit/Source/WebCore/platform/graphics/skia -Ithird_party/WebKit/Source/WebCore/platform/graphics/transforms -Ithird_party/WebKit/Source/WebCore/platform/image-decoders -Ithird_party/WebKit/Source/WebCore/platform/image-decoders/bmp -Ithird_party/WebKit/Source/WebCore/platform/image-decoders/gif -Ithird_party/WebKit/Source/WebCore/platform/image-decoders/ico -Ithird_party/WebKit/Source/WebCore/platform/image-decoders/jpeg -Ithird_party/WebKit/Source/WebCore/platform/image-decoders/png -Ithird_party/WebKit/Source/WebCore/platform/image-decoders/skia -Ithird_party/WebKit/Source/WebCore/platform/image-decoders/xbm -Ithird_party/WebKit/Source/WebCore/platform/image-decoders/webp -Ithird_party/WebKit/Source/WebCore/platform/image-encoders/skia -Ithird_party/WebKit/Source/WebCore/platform/mock -Ithird_party/WebKit/Source/WebCore/platform/network -Ithird_party/WebKit/Source/WebCore/platform/network/chromium -Ithird_party/WebKit/Source/WebCore/platform/sql -Ithird_party/WebKit/Source/WebCore/platform/text -Ithird_party/WebKit/Source/WebCore/platform/text/transcoder -Ithird_party/WebKit/Source/WebCore/plugins -Ithird_party/WebKit/Source/WebCore/plugins/chromium -Ithird_party/WebKit/Source/WebCore/rendering -Ithird_party/WebKit/Source/WebCore/rendering/style -Ithird_party/WebKit/Source/WebCore/rendering/svg -Ithird_party/WebKit/Source/WebCore/storage -Ithird_party/WebKit/Source/WebCore/storage/chromium -Ithird_party/WebKit/Source/WebCore/svg -Ithird_party/WebKit/Source/WebCore/svg/animation -Ithird_party/WebKit/Source/WebCore/svg/graphics -Ithird_party/WebKit/Source/WebCore/svg/graphics/filters -Ithird_party/WebKit/Source/WebCore/svg/properties -Ithird_party/WebKit/Source/WebCore/thirdparty/glu -Ithird_party/WebKit/Source/WebCore/webaudio -Ithird_party/WebKit/Source/WebCore/websockets -Ithird_party/WebKit/Source/WebCore/workers -Ithird_party/WebKit/Source/WebCore/xml -Ithird_party/angle/include/GLSLANG -Iout/Release/obj/gen/webkit -Iout/Release/obj/gen/webkit/bindings -Ithird_party/WebKit/Source/JavaScriptCore -Ithird_party/WebKit/Source/JavaScriptCore/wtf -I. -Iskia/config -Ithird_party/skia/include/config -Ithird_party/skia/include/core -Ithird_party/skia/include/effects -Ithird_party/skia/include/gpu -Ithird_party/skia/gpu/include -Iskia/ext -Ithird_party/iccjpeg -Ithird_party/libwebp -Ithird_party/libwebp/webp -Ithird_party/libxml/linux/include -Ithird_party/libxml/src/include -Ithird_party/libxslt -Ithird_party/npapi -Ithird_party/npapi/bindings -Ithird_party/ots/include -Ithird_party/sqlite -Iv8/include -Wno-uninitialized -Werror -pthread -fno-exceptions -Wall -Wno-unused-parameter -Wno-missing-field-initializers -D_FILE_OFFSET_BITS=64 -fvisibility=hidden -pipe -fPIC -fno-strict-aliasing -I/usr/local/arm-rootfs/usr/include/libpng12 -I/usr/local/arm-rootfs/usr/include -pthread -I/usr/local/arm-rootfs/usr/include/gtk-2.0 -I/usr/local/arm-rootfs/usr/lib/gtk-2.0/include -I/usr/local/arm-rootfs/usr/include/atk-1.0 -I/usr/local/arm-rootfs/usr/include/cairo -I/usr/local/arm-rootfs/usr/include/pango-1.0 -I/usr/local/arm-rootfs/usr/include/glib-2.0 -I/usr/local/arm-rootfs/usr/lib/glib-2.0/include -I/usr/local/arm-rootfs/usr/include/pixman-1 -I/usr/local/arm-rootfs/usr/include/freetype2 -I/usr/local/arm-rootfs/usr/include -I/usr/local/arm-rootfs/usr/include/libpng12 -mthumb -Wa,-mimplicit-it=thumb -march=armv7-a -mtune=cortex-a8 -mfloat-abi=softfp -mfpu=vfpv3-d16 --sysroot=/usr/local/arm-rootfs -O2 -fno-ident -fdata-sections -ffunction-sections -fno-rtti -fno-threadsafe-statics -fvisibility-inlines-hidden -Wno-abi -MMD -MF out/Release/.deps/out/Release/obj.target/webcore_remaining/third_party/WebKit/Source/WebCore/css/CSSPrimitiveValue.o.d.raw -c -o out/Release/obj.target/webcore_remaining/third_party/WebKit/Source/WebCore/css/CSSPrimitiveValue.o third_party/WebKit/Source/WebCore/css/CSSPrimitiveValue.cpp 344345 9 80991 dglazkov 2011-02-02 15:59:29 -0800 Created attachment 80991 Prettier words. 344359 10 webkit.review.bot 2011-02-02 16:12:33 -0800 Attachment 80991 did not build on chromium: Build output: http://queues.webkit.org/results/7687694 344361 11 80991 dglazkov 2011-02-02 16:13:57 -0800 Comment on attachment 80991 Prettier words. i suck. 344364 12 80991 eric 2011-02-02 16:14:38 -0800 Comment on attachment 80991 Prettier words. Definitely better. do we not have any information about the compiler bug itself? gcc has a bugzilla instance. :) We don't know what versions this affects? It's stil impossible to ever remove this code as written... 344369 13 80998 dglazkov 2011-02-02 16:16:38 -0800 Created attachment 80998 Fixed my mistakes. 344378 14 dglazkov 2011-02-02 16:21:29 -0800 (In reply to comment #12) > (From update of attachment 80991 [details]) > Definitely better. do we not have any information about the compiler bug itself? gcc has a bugzilla instance. :) We don't know what versions this affects? It's stil impossible to ever remove this code as written... I scanned gcc.gnu.org, but couldn't find anything interesting. Lots of bugs related to the warning, all in different states. I mentioned the version in the ChangeLog. This would be a much more doable task if I actually had access to an ARM device. Right now, it takes me asking nsylvain to patch the bot (!!!!) and see of the patch actually works -- for each iteration. 344393 15 buildbot 2011-02-02 16:35:11 -0800 Attachment 80991 did not build on win: Build output: http://queues.webkit.org/results/7690236 344470 16 80998 levin 2011-02-02 18:12:00 -0800 Comment on attachment 80998 Fixed my mistakes. ok. 344480 17 80998 dglazkov 2011-02-02 18:43:33 -0800 Comment on attachment 80998 Fixed my mistakes. Yaaay! 344510 18 80998 commit-queue 2011-02-02 20:41:10 -0800 Comment on attachment 80998 Fixed my mistakes. Clearing flags on attachment: 80998 Committed r77464: <http://trac.webkit.org/changeset/77464> 344511 19 commit-queue 2011-02-02 20:41:17 -0800 All reviewed patches have been landed. Closing bug. 345568 20 80998 darin 2011-02-04 10:03:58 -0800 Comment on attachment 80998 Fixed my mistakes. View in context: https://bugs.webkit.org/attachment.cgi?id=80998&action=review > Source/WebCore/css/CSSPrimitiveValue.cpp:130 > +#if CPU(ARM) && OS(LINUX) I’d rather see a condition that more directly targets the buggy compiler. For example, this expression doesn’t even include COMPILER(GCC)! > Source/WebCore/css/CSSPrimitiveValue.cpp:131 > + // A workaround for gcc bug on ARM. It would be so much better if this had specifics about the bug. 345761 21 levin 2011-02-04 13:47:56 -0800 (In reply to comment #20) > (From update of attachment 80998 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=80998&action=review > > > Source/WebCore/css/CSSPrimitiveValue.cpp:130 > > +#if CPU(ARM) && OS(LINUX) > > I’d rather see a condition that more directly targets the buggy compiler. For example, this expression doesn’t even include COMPILER(GCC)! > > > Source/WebCore/css/CSSPrimitiveValue.cpp:131 > > + // A workaround for gcc bug on ARM. > > It would be so much better if this had specifics about the bug. Filed bug 53808. 80955 2011-02-02 13:06:39 -0800 2011-02-02 15:59:27 -0800 Patch bug-53620-20110202130638.patch text/plain 1912 dglazkov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2Y2M4ZGNmZTQ0YTJkMDRkOTk5YzhjZDM1NjBhY2NlMDE4YWY5MDM2Li5h YmUzNzhkMzBjNWU3NDRlMTJjOGY5Zjg4MDk3NjVmMDE5M2U0YjkwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDUgKzEsMTUgQEAKIDIwMTEtMDItMDIgIERpbWl0cmkgR2xhemtvdiAgPGRnbGF6a292QGNocm9t aXVtLm9yZz4KIAorICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBHQ0MgY29tcGlsZXIgb24gQVJNIGlzc3VlcyBib2d1cyB3YXJuaW5ncyBhbmQgZmFpbHMgdG8g Y29tcGlsZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTUzNjIwCisKKyAgICAgICAgKiBjc3MvQ1NTUHJpbWl0aXZlVmFsdWUuY3BwOgorICAgICAgICAo V2ViQ29yZTo6Q1NTUHJpbWl0aXZlVmFsdWU6OmNyZWF0ZUNvbG9yKTogQWRkZWQgd29ya2Fyb3Vu ZHMgdG8gcGFjaWZ5IHRoZSBjb21waWxlci4KKworMjAxMS0wMi0wMiAgRGltaXRyaSBHbGF6a292 ICA8ZGdsYXprb3ZAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFVwZGF0ZSBtb3JlIHJlZmVyZW5j ZXMgdG8gcmlnaHQoKSBhbmQgYm90dG9tKCkgaW4gQ2hyb21pdW0gV2luLgogCiAgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vVHJhbnNwYXJlbmN5V2luLmNwcDoKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWUuY3BwCmluZGV4IDhkN2M3N2IyYjU0ZTY3M2IwMWE3 ZThiNDA0NTljNmEyMjcwYTUyYzYuLjBjOTNmZDQ3ZWVmNWNmMmUwNGRhN2E3NGExM2NjOTM5YTNl NjUwZDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZS5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlLmNwcApAQCAtMTI3 LDEwICsxMjcsMTQgQEAgUGFzc1JlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gQ1NTUHJpbWl0aXZl VmFsdWU6OmNyZWF0ZUNvbG9yKHVuc2lnbmVkIHJnYlZhbHVlKQogICAgIC8vIFRoZXNlIGFyZSB0 aGUgZW1wdHkgYW5kIGRlbGV0ZWQgdmFsdWVzIG9mIHRoZSBoYXNoIHRhYmxlLgogICAgIGlmIChy Z2JWYWx1ZSA9PSBDb2xvcjo6dHJhbnNwYXJlbnQpIHsKICAgICAgICAgc3RhdGljIENTU1ByaW1p dGl2ZVZhbHVlKiBjb2xvclRyYW5zcGFyZW50ID0gY3JlYXRlVW5jYWNoZWRDb2xvcihDb2xvcjo6 dHJhbnNwYXJlbnQpLnJlbGVhc2VSZWYoKTsKKyAgICAgICAgaWYgKCFjb2xvclRyYW5zcGFyZW50 KSAvLyBUaGlzIG5vbnNlbnNpY2FsIGNoZWNrIGlzIGEgd29ya2Fyb3VuZCBmb3IgZ2NjIGJ1ZyBv biBBUk0uCisgICAgICAgICAgICByZXR1cm4gMDsKICAgICAgICAgcmV0dXJuIGNvbG9yVHJhbnNw YXJlbnQ7CiAgICAgfQogICAgIGlmIChyZ2JWYWx1ZSA9PSBDb2xvcjo6d2hpdGUpIHsKICAgICAg ICAgc3RhdGljIENTU1ByaW1pdGl2ZVZhbHVlKiBjb2xvcldoaXRlID0gY3JlYXRlVW5jYWNoZWRD b2xvcihDb2xvcjo6d2hpdGUpLnJlbGVhc2VSZWYoKTsKKyAgICAgICAgaWYgKCFjb2xvcldoaXRl KSAvLyBUaGlzIG5vbnNlbnNpY2FsIGNoZWNrIGlzIGEgd29ya2Fyb3VuZCBmb3IgZ2NjIGJ1ZyBv biBBUk0uCisgICAgICAgICAgICByZXR1cm4gMDsKICAgICAgICAgcmV0dXJuIGNvbG9yV2hpdGU7 CiAgICAgfQogICAgIFJlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gcHJpbWl0aXZlVmFsdWUgPSBj b2xvclZhbHVlQ2FjaGUtPmdldChyZ2JWYWx1ZSk7Cg== 80991 2011-02-02 15:59:29 -0800 2011-02-02 16:16:35 -0800 Prettier words. bug-53620-20110202155928.patch text/plain 2212 dglazkov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1ZDMxNWU2Yzc5ZDg4ZWE0MTNmNTU1MGE4ZGRlZTcwZjJiY2FmNDY2Li5j YThjYWMzMzRjNDcyNTI0MjVlMDQ5NzNkYTZhZGVhZDcyMzFhMGVmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjAgQEAKKzIwMTEtMDItMDIgIERpbWl0cmkgR2xhemtvdiAgPGRnbGF6a292QGNocm9t aXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBHQ0MgY29tcGlsZXIgb24gQVJNIGlzc3VlcyBib2d1cyB3YXJuaW5ncyBhbmQgZmFpbHMgdG8g Y29tcGlsZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTUzNjIwCisKKyAgICAgICAgRGVzcGl0ZSB3YXJuaW5ncyBleHBsaWNpdGx5IGJlaW5nIGRpc2Fs bG93ZWQgKC1Xbm8tdW5pbml0aWFsaXplZCksCisgICAgICAgIGdjYyAoVWJ1bnR1IDQuNC4zLTR1 YnVudHU1KSA0LjQuMyB0aHJvd3MgdXAgdGhlIHdhcm5pbmdzIGxpa2U6CisKKyAgICAgICAgImVy cm9yOiAnY29sb3JUcmFuc3BhcmVudC51bnN0YXRpYy40OTA5JyBtYXkgYmUgdXNlZCB1bmluaXRp YWxpemVkIGluIHRoaXMgZnVuY3Rpb24iCisKKyAgICAgICAgVGhlIGZpeCBpcyB0byBhZGQgYW4g ZXh0cmEgY29uZGl0aW9uLCB3aGljaCBzb21laG93IHBhY2lmaWVzIHRoZSBjb21waWxlci4KKwor ICAgICAgICAqIGNzcy9DU1NQcmltaXRpdmVWYWx1ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpD U1NQcmltaXRpdmVWYWx1ZTo6Y3JlYXRlQ29sb3IpOiBBZGRlZCB3b3JrYXJvdW5kIGNvbmRpdGlv bnMuCisKIDIwMTEtMDItMDIgIFZhbmdlbGlzIEtva2tldmlzICA8dmFuZ2VsaXNAY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFtjaHJvbWl1bV0gQWRkaW5nIHN1cHBvcnQgZm9yIHJlZmxlY3Rpb25z IHRvIHRoZSBhY2NlbGVyYXRlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1By aW1pdGl2ZVZhbHVlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZS5j cHAKaW5kZXggOGQ3Yzc3YjJiNTRlNjczYjAxYTdlOGI0MDQ1OWM2YTIyNzBhNTJjNi4uMjEwYmQ4 MTI3ZDVhOWQ4NTgzYmE5NWIxZmYxMDM0NTFkOTIwY2FiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3Mv Q1NTUHJpbWl0aXZlVmFsdWUuY3BwCkBAIC0xMjcsMTAgKzEyNywyMCBAQCBQYXNzUmVmUHRyPENT U1ByaW1pdGl2ZVZhbHVlPiBDU1NQcmltaXRpdmVWYWx1ZTo6Y3JlYXRlQ29sb3IodW5zaWduZWQg cmdiVmFsdWUpCiAgICAgLy8gVGhlc2UgYXJlIHRoZSBlbXB0eSBhbmQgZGVsZXRlZCB2YWx1ZXMg b2YgdGhlIGhhc2ggdGFibGUuCiAgICAgaWYgKHJnYlZhbHVlID09IENvbG9yOjp0cmFuc3BhcmVu dCkgewogICAgICAgICBzdGF0aWMgQ1NTUHJpbWl0aXZlVmFsdWUqIGNvbG9yVHJhbnNwYXJlbnQg PSBjcmVhdGVVbmNhY2hlZENvbG9yKENvbG9yOjp0cmFuc3BhcmVudCkucmVsZWFzZVJlZigpOwor I2lmZGVmIENQVShBUk0pICYmIE9TKExJTlVYKQorICAgICAgICAgLy8gQSB3b3JrYXJvdW5kIGZv ciBnY2MgYnVnIG9uIEFSTS4KKyAgICAgICAgaWYgKCFjb2xvclRyYW5zcGFyZW50KQorICAgICAg ICAgICAgcmV0dXJuIDA7CisjZW5kaWYKICAgICAgICAgcmV0dXJuIGNvbG9yVHJhbnNwYXJlbnQ7 CiAgICAgfQogICAgIGlmIChyZ2JWYWx1ZSA9PSBDb2xvcjo6d2hpdGUpIHsKICAgICAgICAgc3Rh dGljIENTU1ByaW1pdGl2ZVZhbHVlKiBjb2xvcldoaXRlID0gY3JlYXRlVW5jYWNoZWRDb2xvcihD b2xvcjo6d2hpdGUpLnJlbGVhc2VSZWYoKTsKKyNpZmRlZiBDUFUoQVJNKSAmJiBPUyhMSU5VWCkK KyAgICAgICAgLy8gQSB3b3JrYXJvdW5kIGZvciBnY2MgYnVnIG9uIEFSTS4KKyAgICAgICAgaWYg KCFjb2xvcldoaXRlKQorICAgICAgICAgICAgcmV0dXJuIDA7CisjZW5kaWYKICAgICAgICAgcmV0 dXJuIGNvbG9yV2hpdGU7CiAgICAgfQogICAgIFJlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gcHJp bWl0aXZlVmFsdWUgPSBjb2xvclZhbHVlQ2FjaGUtPmdldChyZ2JWYWx1ZSk7Cg== 80998 2011-02-02 16:16:38 -0800 2011-02-04 10:03:58 -0800 Fixed my mistakes. bug-53620-20110202161637.patch text/plain 2164 dglazkov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlNGUxYzg5OThlMDhhYzY3Yzk5MGNmZDZjOTM2ODM3ZDg0MjJlMmYwLi4x NzUzYzFkMmQxYTJiMDU1MGExM2VhZmUyNWI5MDgwYzJiNzgzZTliIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjAgQEAKKzIwMTEtMDItMDIgIERpbWl0cmkgR2xhemtvdiAgPGRnbGF6a292QGNocm9t aXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBHQ0MgY29tcGlsZXIgb24gQVJNIGlzc3VlcyBib2d1cyB3YXJuaW5ncyBhbmQgZmFpbHMgdG8g Y29tcGlsZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTUzNjIwCisKKyAgICAgICAgRGVzcGl0ZSB3YXJuaW5ncyBleHBsaWNpdGx5IGJlaW5nIGRpc2Fs bG93ZWQgKC1Xbm8tdW5pbml0aWFsaXplZCksCisgICAgICAgIGdjYyAoVWJ1bnR1IDQuNC4zLTR1 YnVudHU1KSA0LjQuMyB0aHJvd3MgdXAgdGhlIHdhcm5pbmdzIGxpa2U6CisKKyAgICAgICAgImVy cm9yOiAnY29sb3JUcmFuc3BhcmVudC51bnN0YXRpYy40OTA5JyBtYXkgYmUgdXNlZCB1bmluaXRp YWxpemVkIGluIHRoaXMgZnVuY3Rpb24iCisKKyAgICAgICAgVGhlIGZpeCBpcyB0byBhZGQgYW4g ZXh0cmEgY29uZGl0aW9uLCB3aGljaCBzb21laG93IHBhY2lmaWVzIHRoZSBjb21waWxlci4KKwor ICAgICAgICAqIGNzcy9DU1NQcmltaXRpdmVWYWx1ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpD U1NQcmltaXRpdmVWYWx1ZTo6Y3JlYXRlQ29sb3IpOiBBZGRlZCB3b3JrYXJvdW5kIGNvbmRpdGlv bnMuCisKIDIwMTEtMDItMDIgIFBldGVyIEthc3RpbmcgIDxwa2FzdGluZ0Bnb29nbGUuY29tPgog CiAgICAgICAgIE5vdCByZXZpZXdlZCwgYnVpbGQgZml4LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQ cmltaXRpdmVWYWx1ZS5jcHAKaW5kZXggOGQ3Yzc3YjJiNTRlNjczYjAxYTdlOGI0MDQ1OWM2YTIy NzBhNTJjNi4uNmQ5MzBiZDYxYmViMWM1NGQyYjE1MWRjYmYyMjNjOGIxMTA0MDg5NSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWUuY3BwCkBAIC0xMjcsMTAgKzEyNywyMCBA QCBQYXNzUmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVlPiBDU1NQcmltaXRpdmVWYWx1ZTo6Y3JlYXRl Q29sb3IodW5zaWduZWQgcmdiVmFsdWUpCiAgICAgLy8gVGhlc2UgYXJlIHRoZSBlbXB0eSBhbmQg ZGVsZXRlZCB2YWx1ZXMgb2YgdGhlIGhhc2ggdGFibGUuCiAgICAgaWYgKHJnYlZhbHVlID09IENv bG9yOjp0cmFuc3BhcmVudCkgewogICAgICAgICBzdGF0aWMgQ1NTUHJpbWl0aXZlVmFsdWUqIGNv bG9yVHJhbnNwYXJlbnQgPSBjcmVhdGVVbmNhY2hlZENvbG9yKENvbG9yOjp0cmFuc3BhcmVudCku cmVsZWFzZVJlZigpOworI2lmIENQVShBUk0pICYmIE9TKExJTlVYKQorICAgICAgICAgLy8gQSB3 b3JrYXJvdW5kIGZvciBnY2MgYnVnIG9uIEFSTS4KKyAgICAgICAgaWYgKCFjb2xvclRyYW5zcGFy ZW50KQorICAgICAgICAgICAgcmV0dXJuIDA7CisjZW5kaWYKICAgICAgICAgcmV0dXJuIGNvbG9y VHJhbnNwYXJlbnQ7CiAgICAgfQogICAgIGlmIChyZ2JWYWx1ZSA9PSBDb2xvcjo6d2hpdGUpIHsK ICAgICAgICAgc3RhdGljIENTU1ByaW1pdGl2ZVZhbHVlKiBjb2xvcldoaXRlID0gY3JlYXRlVW5j YWNoZWRDb2xvcihDb2xvcjo6d2hpdGUpLnJlbGVhc2VSZWYoKTsKKyNpZiBDUFUoQVJNKSAmJiBP UyhMSU5VWCkKKyAgICAgICAgLy8gQSB3b3JrYXJvdW5kIGZvciBnY2MgYnVnIG9uIEFSTS4KKyAg ICAgICAgaWYgKCFjb2xvcldoaXRlKQorICAgICAgICAgICAgcmV0dXJuIDA7CisjZW5kaWYKICAg ICAgICAgcmV0dXJuIGNvbG9yV2hpdGU7CiAgICAgfQogICAgIFJlZlB0cjxDU1NQcmltaXRpdmVW YWx1ZT4gcHJpbWl0aXZlVmFsdWUgPSBjb2xvclZhbHVlQ2FjaGUtPmdldChyZ2JWYWx1ZSk7Cg==