Merge branch 'TrompoGames-master'

Author: phoboslab

JavaScriptCore/API/OpaqueJSString.cpp

@@ -41,7 +41,10 @@ PassRefPtr<OpaqueJSString> OpaqueJSString::create(const String& string)
 
 String OpaqueJSString::string() const
 {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wundefined-bool-conversion"
     if (!this)
+#pragma clang diagnostic pop
         return String();
 
     // Return a copy of the wrapped string, because the caller may make it an Identifier.
@@ -50,7 +53,10 @@ String OpaqueJSString::string() const
 
 Identifier OpaqueJSString::identifier(VM* vm) const
 {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wundefined-bool-conversion"
     if (!this || m_string.isNull())
+#pragma clang diagnostic pop
         return Identifier();
 
     if (m_string.isEmpty())

JavaScriptCore/API/OpaqueJSString.h

@@ -53,8 +53,11 @@ struct OpaqueJSString : public ThreadSafeRefCounted<OpaqueJSString> {
 
     JS_EXPORT_PRIVATE static PassRefPtr<OpaqueJSString> create(const String&);
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wundefined-bool-conversion"
     const UChar* characters() { return !!this ? m_string.characters() : 0; }
     unsigned length() { return !!this ? m_string.length() : 0; }
+#pragma clang diagnostic pop
 
     JS_EXPORT_PRIVATE String string() const;
     JSC::Identifier identifier(JSC::VM*) const;

JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -986,7 +986,7 @@ class MacroAssembler : public MacroAssemblerBase {
         if (bitwise_cast<uint64_t>(value * 1.0) != bitwise_cast<uint64_t>(value))
             return shouldConsiderBlinding();
 
-        value = abs(value);
+        value = fabs(value);
         // Only allow a limited set of fractional components
         double scaledValue = value * 8;
         if (scaledValue / 8 != value)

JavaScriptCore/assembler/MacroAssembler.h

@@ -269,7 +269,10 @@ namespace JSC  {
 
         bool isVMEntrySentinel() const
         {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wundefined-bool-conversion"
             return !!this && codeBlock() == vmEntrySentinelCodeBlock();
+#pragma clang diagnostic pop
         }
 
         CallFrame* vmEntrySentinelCallerFrame() const

JavaScriptCore/interpreter/CallFrame.h

@@ -55,7 +55,10 @@ namespace JSC {
         intptr_t asID()
         {
             ASSERT(this);
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wundefined-bool-conversion"
             if (!this) // Be defensive in release mode.
+#pragma clang diagnostic pop
                 return nullID;
             if (!m_id)
                 getID();

JavaScriptCore/parser/SourceProvider.h

@@ -1333,6 +1333,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 6541CAF41630DB26006D0DEC /* CopyWTFHeaders.xcconfig */;
 			buildSettings = {
+				ENABLE_BITCODE = YES;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -1341,6 +1342,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 6541CAF41630DB26006D0DEC /* CopyWTFHeaders.xcconfig */;
 			buildSettings = {
+				ENABLE_BITCODE = YES;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
@@ -1349,6 +1351,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 6541CAF41630DB26006D0DEC /* CopyWTFHeaders.xcconfig */;
 			buildSettings = {
+				ENABLE_BITCODE = YES;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Production;

WTF/WTF.xcodeproj/project.pbxproj

@@ -294,7 +294,7 @@ namespace double_conversion {
     inline Dest BitCast(const Source& source) {
         // Compile time assertion: sizeof(Dest) == sizeof(Source)
         // A compile error here means your Dest and Source have different sizes.
-        typedef char VerifySizesAreEqual[sizeof(Dest) == sizeof(Source) ? 1 : -1];
+        //typedef char VerifySizesAreEqual[sizeof(Dest) == sizeof(Source) ? 1 : -1];
 
         Dest dest;
         memcpy(&dest, &source, sizeof(dest));