<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[173245] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/173245">173245</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2014-09-03 17:53:16 -0700 (Wed, 03 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>JavaScriptCore should build with newer clang
<http://webkit.org/b/136002>
<rdar://problem/18020616>
Reviewed by Geoffrey Garen.
Source/JavaScriptCore:
Other than the JSC::SourceProvider::asID() change (which simply
removes code that the optimizing compiler would have discarded
in Release builds), we move the |this| checks in OpaqueJSString
to NULL checks in to JSBase, JSScriptRef, JSStringRef{CF} and
JSValueRef.
* API/JSBase.cpp:
(JSEvaluateScript): Use String() in case |script| or |sourceURL|
are NULL.
* API/JSScriptRef.cpp:
(JSScriptCreateReferencingImmortalASCIIText): Use String() in
case |url| is NULL.
* API/JSStringRef.cpp:
(JSStringGetLength): Return early if NULL pointer is passed in.
(JSStringGetCharactersPtr): Ditto.
(JSStringGetUTF8CString): Ditto. Also check |buffer| parameter.
* API/JSStringRefCF.cpp:
(JSStringCopyCFString): Ditto.
* API/JSValueRef.cpp:
(JSValueMakeString): Use String() in case |string| is NULL.
* API/OpaqueJSString.cpp:
(OpaqueJSString::string): Remove code that checks |this|.
(OpaqueJSString::identifier): Ditto.
(OpaqueJSString::characters): Ditto.
* API/OpaqueJSString.h:
(OpaqueJSString::is8Bit): Remove code that checks |this|.
(OpaqueJSString::characters8): Ditto.
(OpaqueJSString::characters16): Ditto.
(OpaqueJSString::length): Ditto.
* parser/SourceProvider.h:
(JSC::SourceProvider::asID): Remove code that checks |this|.
Source/WebKit2:
* Shared/API/c/WKString.cpp:
(WKStringCreateWithJSString): Add NULL check to prevent
WebKitTestRunner crashes that relied on the previous |this|
behavior where NULL values were allowed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreAPIJSBasecpp">trunk/Source/JavaScriptCore/API/JSBase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreAPIJSScriptRefcpp">trunk/Source/JavaScriptCore/API/JSScriptRef.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreAPIJSStringRefcpp">trunk/Source/JavaScriptCore/API/JSStringRef.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreAPIJSStringRefCFcpp">trunk/Source/JavaScriptCore/API/JSStringRefCF.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreAPIJSValueRefcpp">trunk/Source/JavaScriptCore/API/JSValueRef.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreAPIOpaqueJSStringcpp">trunk/Source/JavaScriptCore/API/OpaqueJSString.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreAPIOpaqueJSStringh">trunk/Source/JavaScriptCore/API/OpaqueJSString.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserSourceProviderh">trunk/Source/JavaScriptCore/parser/SourceProvider.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKStringcpp">trunk/Source/WebKit2/Shared/API/c/WKString.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreAPIJSBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/JSBase.cpp (173244 => 173245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/JSBase.cpp 2014-09-04 00:28:50 UTC (rev 173244)
+++ trunk/Source/JavaScriptCore/API/JSBase.cpp 2014-09-04 00:53:16 UTC (rev 173245)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx">
</span><span class="cx"> // evaluate sets "this" to the global object if it is NULL
</span><span class="cx"> JSGlobalObject* globalObject = exec->vmEntryGlobalObject();
</span><del>- SourceCode source = makeSource(script->string(), sourceURL->string(), TextPosition(OrdinalNumber::fromOneBasedInt(startingLineNumber), OrdinalNumber::first()));
</del><ins>+ SourceCode source = makeSource(script ? script->string() : String(), sourceURL ? sourceURL->string() : String(), TextPosition(OrdinalNumber::fromOneBasedInt(startingLineNumber), OrdinalNumber::first()));
</ins><span class="cx">
</span><span class="cx"> JSValue evaluationException;
</span><span class="cx"> JSValue returnValue = evaluate(globalObject->globalExec(), source, jsThisObject, &evaluationException);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreAPIJSScriptRefcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/JSScriptRef.cpp (173244 => 173245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/JSScriptRef.cpp 2014-09-04 00:28:50 UTC (rev 173244)
+++ trunk/Source/JavaScriptCore/API/JSScriptRef.cpp 2014-09-04 00:53:16 UTC (rev 173245)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx">
</span><span class="cx"> startingLineNumber = std::max(1, startingLineNumber);
</span><span class="cx">
</span><del>- RefPtr<OpaqueJSScript> result = OpaqueJSScript::create(vm, url->string(), startingLineNumber, String(StringImpl::createFromLiteral(source, length)));
</del><ins>+ RefPtr<OpaqueJSScript> result = OpaqueJSScript::create(vm, url ? url->string() : String(), startingLineNumber, String(StringImpl::createFromLiteral(source, length)));
</ins><span class="cx">
</span><span class="cx"> ParserError error;
</span><span class="cx"> if (!parseScript(vm, SourceCode(result), error)) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreAPIJSStringRefcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/JSStringRef.cpp (173244 => 173245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/JSStringRef.cpp 2014-09-04 00:28:50 UTC (rev 173244)
+++ trunk/Source/JavaScriptCore/API/JSStringRef.cpp 2014-09-04 00:53:16 UTC (rev 173245)
</span><span class="lines">@@ -78,11 +78,15 @@
</span><span class="cx">
</span><span class="cx"> size_t JSStringGetLength(JSStringRef string)
</span><span class="cx"> {
</span><ins>+ if (!string)
+ return 0;
</ins><span class="cx"> return string->length();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const JSChar* JSStringGetCharactersPtr(JSStringRef string)
</span><span class="cx"> {
</span><ins>+ if (!string)
+ return nullptr;
</ins><span class="cx"> return string->characters();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -94,7 +98,7 @@
</span><span class="cx">
</span><span class="cx"> size_t JSStringGetUTF8CString(JSStringRef string, char* buffer, size_t bufferSize)
</span><span class="cx"> {
</span><del>- if (!bufferSize)
</del><ins>+ if (!string || !buffer || !bufferSize)
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> char* destination = buffer;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreAPIJSStringRefCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/JSStringRefCF.cpp (173244 => 173245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/JSStringRefCF.cpp 2014-09-04 00:28:50 UTC (rev 173244)
+++ trunk/Source/JavaScriptCore/API/JSStringRefCF.cpp 2014-09-04 00:53:16 UTC (rev 173245)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx">
</span><span class="cx"> CFStringRef JSStringCopyCFString(CFAllocatorRef allocator, JSStringRef string)
</span><span class="cx"> {
</span><del>- if (!string->length())
</del><ins>+ if (!string || !string->length())
</ins><span class="cx"> return CFSTR("");
</span><span class="cx">
</span><span class="cx"> if (string->is8Bit())
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreAPIJSValueRefcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/JSValueRef.cpp (173244 => 173245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/JSValueRef.cpp 2014-09-04 00:28:50 UTC (rev 173244)
+++ trunk/Source/JavaScriptCore/API/JSValueRef.cpp 2014-09-04 00:53:16 UTC (rev 173245)
</span><span class="lines">@@ -318,7 +318,7 @@
</span><span class="cx"> ExecState* exec = toJS(ctx);
</span><span class="cx"> JSLockHolder locker(exec);
</span><span class="cx">
</span><del>- return toRef(exec, jsString(exec, string->string()));
</del><ins>+ return toRef(exec, jsString(exec, string ? string->string() : String()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValueRef JSValueMakeFromJSONString(JSContextRef ctx, JSStringRef string)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreAPIOpaqueJSStringcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/OpaqueJSString.cpp (173244 => 173245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/OpaqueJSString.cpp 2014-09-04 00:28:50 UTC (rev 173244)
+++ trunk/Source/JavaScriptCore/API/OpaqueJSString.cpp 2014-09-04 00:53:16 UTC (rev 173245)
</span><span class="lines">@@ -56,16 +56,13 @@
</span><span class="cx">
</span><span class="cx"> String OpaqueJSString::string() const
</span><span class="cx"> {
</span><del>- if (!this)
- return String();
-
</del><span class="cx"> // Return a copy of the wrapped string, because the caller may make it an Identifier.
</span><span class="cx"> return m_string.isolatedCopy();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Identifier OpaqueJSString::identifier(VM* vm) const
</span><span class="cx"> {
</span><del>- if (!this || m_string.isNull())
</del><ins>+ if (m_string.isNull())
</ins><span class="cx"> return Identifier();
</span><span class="cx">
</span><span class="cx"> if (m_string.isEmpty())
</span><span class="lines">@@ -79,9 +76,6 @@
</span><span class="cx">
</span><span class="cx"> const UChar* OpaqueJSString::characters()
</span><span class="cx"> {
</span><del>- if (!this)
- return nullptr;
-
</del><span class="cx"> // m_characters is put in a local here to avoid an extra atomic load.
</span><span class="cx"> UChar* characters = m_characters;
</span><span class="cx"> if (characters)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreAPIOpaqueJSStringh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/OpaqueJSString.h (173244 => 173245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/OpaqueJSString.h 2014-09-04 00:28:50 UTC (rev 173244)
+++ trunk/Source/JavaScriptCore/API/OpaqueJSString.h 2014-09-04 00:53:16 UTC (rev 173245)
</span><span class="lines">@@ -55,10 +55,10 @@
</span><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE ~OpaqueJSString();
</span><span class="cx">
</span><del>- bool is8Bit() { return this ? m_string.is8Bit() : false; }
- const LChar* characters8() { return this ? m_string.characters8() : nullptr; }
- const UChar* characters16() { return this ? m_string.characters16() : nullptr; }
- unsigned length() { return this ? m_string.length() : 0; }
</del><ins>+ bool is8Bit() { return m_string.is8Bit(); }
+ const LChar* characters8() { return m_string.characters8(); }
+ const UChar* characters16() { return m_string.characters16(); }
+ unsigned length() { return m_string.length(); }
</ins><span class="cx">
</span><span class="cx"> const UChar* characters();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (173244 => 173245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-09-04 00:28:50 UTC (rev 173244)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-09-04 00:53:16 UTC (rev 173245)
</span><span class="lines">@@ -1,3 +1,45 @@
</span><ins>+2014-09-03 David Kilzer <ddkilzer@apple.com>
+
+ JavaScriptCore should build with newer clang
+ <http://webkit.org/b/136002>
+ <rdar://problem/18020616>
+
+ Reviewed by Geoffrey Garen.
+
+ Other than the JSC::SourceProvider::asID() change (which simply
+ removes code that the optimizing compiler would have discarded
+ in Release builds), we move the |this| checks in OpaqueJSString
+ to NULL checks in to JSBase, JSScriptRef, JSStringRef{CF} and
+ JSValueRef.
+
+ * API/JSBase.cpp:
+ (JSEvaluateScript): Use String() in case |script| or |sourceURL|
+ are NULL.
+ * API/JSScriptRef.cpp:
+ (JSScriptCreateReferencingImmortalASCIIText): Use String() in
+ case |url| is NULL.
+ * API/JSStringRef.cpp:
+ (JSStringGetLength): Return early if NULL pointer is passed in.
+ (JSStringGetCharactersPtr): Ditto.
+ (JSStringGetUTF8CString): Ditto. Also check |buffer| parameter.
+ * API/JSStringRefCF.cpp:
+ (JSStringCopyCFString): Ditto.
+ * API/JSValueRef.cpp:
+ (JSValueMakeString): Use String() in case |string| is NULL.
+
+ * API/OpaqueJSString.cpp:
+ (OpaqueJSString::string): Remove code that checks |this|.
+ (OpaqueJSString::identifier): Ditto.
+ (OpaqueJSString::characters): Ditto.
+ * API/OpaqueJSString.h:
+ (OpaqueJSString::is8Bit): Remove code that checks |this|.
+ (OpaqueJSString::characters8): Ditto.
+ (OpaqueJSString::characters16): Ditto.
+ (OpaqueJSString::length): Ditto.
+
+ * parser/SourceProvider.h:
+ (JSC::SourceProvider::asID): Remove code that checks |this|.
+
</ins><span class="cx"> 2014-09-03 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> CallEdgeProfile::visitWeak() shouldn't attempt to despecify empty profiles
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserSourceProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/SourceProvider.h (173244 => 173245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/SourceProvider.h 2014-09-04 00:28:50 UTC (rev 173244)
+++ trunk/Source/JavaScriptCore/parser/SourceProvider.h 2014-09-04 00:53:16 UTC (rev 173245)
</span><span class="lines">@@ -54,9 +54,6 @@
</span><span class="cx"> TextPosition startPosition() const { return m_startPosition; }
</span><span class="cx"> intptr_t asID()
</span><span class="cx"> {
</span><del>- ASSERT(this);
- if (!this) // Be defensive in release mode.
- return nullID;
</del><span class="cx"> if (!m_id)
</span><span class="cx"> getID();
</span><span class="cx"> return m_id;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (173244 => 173245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-09-04 00:28:50 UTC (rev 173244)
+++ trunk/Source/WebKit2/ChangeLog 2014-09-04 00:53:16 UTC (rev 173245)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-09-03 David Kilzer <ddkilzer@apple.com>
+
+ JavaScriptCore should build with newer clang
+ <http://webkit.org/b/136002>
+ <rdar://problem/18020616>
+
+ Reviewed by Geoffrey Garen.
+
+ * Shared/API/c/WKString.cpp:
+ (WKStringCreateWithJSString): Add NULL check to prevent
+ WebKitTestRunner crashes that relied on the previous |this|
+ behavior where NULL values were allowed.
+
</ins><span class="cx"> 2014-09-03 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove PLATFORM(IOS) from WebCore/editing (Part 1).
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKStringcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKString.cpp (173244 => 173245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKString.cpp 2014-09-04 00:28:50 UTC (rev 173244)
+++ trunk/Source/WebKit2/Shared/API/c/WKString.cpp 2014-09-04 00:53:16 UTC (rev 173245)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx">
</span><span class="cx"> WKStringRef WKStringCreateWithJSString(JSStringRef jsStringRef)
</span><span class="cx"> {
</span><del>- RefPtr<API::String> apiString = API::String::create(jsStringRef);
</del><ins>+ RefPtr<API::String> apiString = jsStringRef ? API::String::create(jsStringRef) : API::String::createNull();
</ins><span class="cx"> return toAPI(apiString.release().leakRef());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>