56198 2011-03-11 08:58:37 -0800 WebCore/loader/appcache/ApplicationCacheGroup fails to compile on S10/SS12 2011-03-11 16:34:20 -0800 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) PC Other RESOLVED FIXED P2 Normal --- 0 bentaylor.solx86 webkit-unassigned ap commit-queue oldest_to_newest 366025 0 bentaylor.solx86 2011-03-11 08:58:37 -0800 qt-everywhere-opensource-src-4.7.1/src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCacheGroup.cpp Solaris 10, Sun Studio 12 (SS12) C++ compiler 767 ASSERT(m_cacheBeingUpdated); 768 if (m_manifestResource) 769 m_cacheBeingUpdated->setManifestResource(m_manifestResource.release()); 770 else { 771 // We can get here as a result of retrying the Complete step, following 772 // a failure of the cache storage to save the newest cache due to hitting 773 // the maximum size. In such a case, m_manifestResource may be 0, as 774 // the manifest was already set on the newest cache object. 775 ASSERT(cacheStorage().isMaximumSizeReached() && m_calledReachedMaxAppCacheSize); 776 } 777 778 RefPtr<ApplicationCache> oldNewestCache = (m_newestCache == m_cacheBeingUpdated) ? 0 : m_newestCache; 779 "loader/appcache/ApplicationCache.cpp", line 778: Error: Ambiguous "?:" expression, second operand of type "int" and third operand of type "WTF::RefPtr<WebCore::ApplicationCache>" can be converted to one another. The Sun Studio 12 C++ compiler does not like having to accept 0 untyped when the other conditional is typed. The following patch makes the compilation error go away. --- qt-everywhere-opensource-src-4.7.1/src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCacheGroup.cpp.ORIG 2011-03-09 15:16:41.124515331 +0000 +++ qt-everywhere-opensource-src-4.7.1/src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCacheGroup.cpp 2011-03-09 14:50:54.718120159 +0000 @@ -775,7 +775,7 @@ ASSERT(cacheStorage().isMaximumSizeReached() && m_calledReachedMaxAppCacheSize); } - RefPtr<ApplicationCache> oldNewestCache = (m_newestCache == m_cacheBeingUpdated) ? 0 : m_newestCache; + RefPtr<ApplicationCache> oldNewestCache = (m_newestCache == m_cacheBeingUpdated) ? RefPtr<ApplicationCache>() : m_newestCache; setNewestCache(m_cacheBeingUpdated.release()); if (cacheStorage().storeNewestCache(this)) { 366174 1 ap 2011-03-11 11:44:20 -0800 I would suggest replacing the ?: with an if instead. Please see <http://www.webkit.org/coding/contributing.html> for information about contributing code to WebKit. 366319 2 85534 bentaylor.solx86 2011-03-11 14:30:20 -0800 Created attachment 85534 Proposed patch which compiles correctly in qt-4.7.1 with webkit enabled on Solaris 10 with SS12 C++ compiler This fix is against webkit head, but works for the webkit distributed with qt-4.7.1. Other attempts to structure the patch as an if/then clause were unsuccessful. 366336 3 85534 ap 2011-03-11 14:52:04 -0800 Comment on attachment 85534 Proposed patch which compiles correctly in qt-4.7.1 with webkit enabled on Solaris 10 with SS12 C++ compiler OK. Some of the EWS bots are badly lagging, but for this kind of change, its enough that a few of them are green. Commit queue should land this automatically in a day or two. 366415 4 85534 commit-queue 2011-03-11 16:34:15 -0800 Comment on attachment 85534 Proposed patch which compiles correctly in qt-4.7.1 with webkit enabled on Solaris 10 with SS12 C++ compiler Clearing flags on attachment: 85534 Committed r80903: <http://trac.webkit.org/changeset/80903> 366416 5 commit-queue 2011-03-11 16:34:20 -0800 All reviewed patches have been landed. Closing bug. 85534 2011-03-11 14:30:20 -0800 2011-03-11 16:34:14 -0800 Proposed patch which compiles correctly in qt-4.7.1 with webkit enabled on Solaris 10 with SS12 C++ compiler wk-ApplicationCacheGroup.cpp.diff text/plain 1557 bentaylor.solx86 SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgwODg1KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDMtMTEgIEJlbiBUYXls b3IgIDxiZW50YXlsb3Iuc29seDg2QGdtYWlsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NTYxOTgKKyAgICAgICAgRml4IGNvbmRpdGlvbmFsIHdoaWNoIGhhZCBhbiBpbnQg Zm9yIG9uZSBjYXNlIGFuZCBhIHBvaW50ZXIgZm9yIGFub3RoZXIuCisKKyAgICAgICAgTm8gbmV3 IHRlc3RzLiBGaXggY29tcGlsYXRpb24gb24gU29sYXJpcyAxMCB3aXRoIFN1blN0dWRpbyAxMiBD KysKKworICAgICAgICAqIGxvYWRlci9hcHBjYWNoZS9BcHBsaWNhdGlvbkNhY2hlR3JvdXAuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6QXBwbGljYXRpb25DYWNoZUdyb3VwOjpjaGVja0lmTG9hZElz Q29tcGxldGUpOgorCiAyMDExLTAzLTExICBEYXZpZCBIeWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4K IAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBGcmFzZXIuCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9sb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZUdyb3VwLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZUdyb3VwLmNw cAkocmV2aXNpb24gODA4ODEpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXBwY2FjaGUvQXBw bGljYXRpb25DYWNoZUdyb3VwLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODY2LDcgKzg2Niw3IEBA CiAgICAgICAgIH0KIAogICAgICAgICBBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZTo6RmFpbHVyZVJl YXNvbiBmYWlsdXJlUmVhc29uOwotICAgICAgICBSZWZQdHI8QXBwbGljYXRpb25DYWNoZT4gb2xk TmV3ZXN0Q2FjaGUgPSAobV9uZXdlc3RDYWNoZSA9PSBtX2NhY2hlQmVpbmdVcGRhdGVkKSA/IDAg OiBtX25ld2VzdENhY2hlOworICAgICAgICBSZWZQdHI8QXBwbGljYXRpb25DYWNoZT4gb2xkTmV3 ZXN0Q2FjaGUgPSAobV9uZXdlc3RDYWNoZSA9PSBtX2NhY2hlQmVpbmdVcGRhdGVkKSA/IFJlZlB0 cjxBcHBsaWNhdGlvbkNhY2hlPigpIDogbV9uZXdlc3RDYWNoZTsKICAgICAgICAgc2V0TmV3ZXN0 Q2FjaGUobV9jYWNoZUJlaW5nVXBkYXRlZC5yZWxlYXNlKCkpOwogICAgICAgICBpZiAoY2FjaGVT dG9yYWdlKCkuc3RvcmVOZXdlc3RDYWNoZSh0aGlzLCBvbGROZXdlc3RDYWNoZS5nZXQoKSwgZmFp bHVyZVJlYXNvbikpIHsKICAgICAgICAgICAgIC8vIE5ldyBjYWNoZSBzdG9yZWQsIG5vdyByZW1v dmUgdGhlIG9sZCBjYWNoZS4K