Changeset 173263 in webkit for trunk/Source/JavaScriptCore/API

Timestamp:

Sep 4, 2014, 10:10:26 AM (11 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r173245.
​https://bugs.webkit.org/show_bug.cgi?id=136533

Broke JSC tests. (Requested by ddkilzer on #webkit).

Reverted changeset:

"JavaScriptCore should build with newer clang"
​https://bugs.webkit.org/show_bug.cgi?id=136002
​http://trac.webkit.org/changeset/173245

Location:

trunk/Source/JavaScriptCore/API

Files:

• JSBase.cpp (modified) (1 diff)
• JSScriptRef.cpp (modified) (1 diff)
• JSStringRef.cpp (modified) (3 diffs)
• JSStringRefCF.cpp (modified) (1 diff)
• JSValueRef.cpp (modified) (1 diff)
• OpaqueJSString.cpp (modified) (3 diffs)
• OpaqueJSString.h (modified) (1 diff)

trunk/Source/JavaScriptCore/API/JSBase.cpp

@@ -61 +61 @@
     // evaluate sets "this" to the global object if it is NULL
     JSGlobalObject* globalObject = exec->vmEntryGlobalObject();
-    SourceCode source = makeSource(script ? script->string() : String(), sourceURL ? sourceURL->string() : String(), TextPosition(OrdinalNumber::fromOneBasedInt(startingLineNumber), OrdinalNumber::first()));
+    SourceCode source = makeSource(script->string(), sourceURL->string(), TextPosition(OrdinalNumber::fromOneBasedInt(startingLineNumber), OrdinalNumber::first()));
 
     JSValue evaluationException;

trunk/Source/JavaScriptCore/API/JSScriptRef.cpp

@@ -85 +85 @@
     startingLineNumber = std::max(1, startingLineNumber);
 
-    RefPtr<OpaqueJSScript> result = OpaqueJSScript::create(vm, url ? url->string() : String(), startingLineNumber, String(StringImpl::createFromLiteral(source, length)));
+    RefPtr<OpaqueJSScript> result = OpaqueJSScript::create(vm, url->string(), startingLineNumber, String(StringImpl::createFromLiteral(source, length)));
 
     ParserError error;

trunk/Source/JavaScriptCore/API/JSStringRef.cpp

@@ -79 +79 @@
 size_t JSStringGetLength(JSStringRef string)
 {
-    if (!string)
-        return 0;
     return string->length();
 }
@@ -86 +84 @@
 const JSChar* JSStringGetCharactersPtr(JSStringRef string)
 {
-    if (!string)
-        return nullptr;
     return string->characters();
 }
@@ -99 +95 @@
 size_t JSStringGetUTF8CString(JSStringRef string, char* buffer, size_t bufferSize)
 {
-    if (!string || !buffer || !bufferSize)
+    if (!bufferSize)
         return 0;
 

trunk/Source/JavaScriptCore/API/JSStringRefCF.cpp

@@ -58 +58 @@
 CFStringRef JSStringCopyCFString(CFAllocatorRef allocator, JSStringRef string)
 {
-    if (!string || !string->length())
+    if (!string->length())
         return CFSTR("");
 

trunk/Source/JavaScriptCore/API/JSValueRef.cpp

@@ -319 +319 @@
     JSLockHolder locker(exec);
 
-    return toRef(exec, jsString(exec, string ? string->string() : String()));
+    return toRef(exec, jsString(exec, string->string()));
 }
 

trunk/Source/JavaScriptCore/API/OpaqueJSString.cpp

@@ -57 +57 @@
 String OpaqueJSString::string() const
 {
+    if (!this)
+        return String();
+
     // Return a copy of the wrapped string, because the caller may make it an Identifier.
     return m_string.isolatedCopy();
@@ -63 +66 @@
 Identifier OpaqueJSString::identifier(VM* vm) const
 {
-    if (m_string.isNull())
+    if (!this || m_string.isNull())
         return Identifier();
 
@@ -77 +80 @@
 const UChar* OpaqueJSString::characters()
 {
+    if (!this)
+        return nullptr;
+
     // m_characters is put in a local here to avoid an extra atomic load.
     UChar* characters = m_characters;

trunk/Source/JavaScriptCore/API/OpaqueJSString.h

@@ -56 +56 @@
     JS_EXPORT_PRIVATE ~OpaqueJSString();
 
-    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(); }
+    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; }
 
     const UChar* characters();