[MERGE chakra-core#1235 @obastemur] cross platform: ch runs on OSX and passes 1198 tests

obastemur · obastemur · commit e201dbdc47db · 2016-07-11T22:31:49.000-07:00
Merge pull request chakra-core#1235 from obastemur:osx_pass We have some minor issues left with ICU, PAL and stack limits. (24 failing tests)
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -109,7 +109,7 @@ endif()
         -Wno-inconsistent-missing-override\
         -Wno-c++14-extensions\
         -Wno-macro-redefined\
-        -Wno-ignored-pragmas\
+        -Wno-pragmas\
         -Wno-invalid-token-paste\
         -Wno-format\
         -Wno-invalid-noreturn\
diff --git a/bin/ChakraCore/CMakeLists.txt b/bin/ChakraCore/CMakeLists.txt
@@ -36,12 +36,14 @@ if(CMAKE_SYSTEM_NAME STREQUAL Linux)
     Chakra.Jsrt
     Chakra.Jsrt.Core
     -Wl,--no-whole-archive
+    Chakra.Pal
     )
 elseif(CMAKE_SYSTEM_NAME STREQUAL Darwin)
   set(lib_target
     -Wl,-undefined,error
     Chakra.Jsrt
     Chakra.Jsrt.Core
+    Chakra.Pal
     )
 else()
   message("This platform is not yet supported")
@@ -76,15 +78,13 @@ set(lib_target "${lib_target}"
 if(CMAKE_SYSTEM_NAME STREQUAL Linux)
   set(lib_target "${lib_target}"
     -Wl,--end-group
-    Chakra.Pal
     pthread
     stdc++
     dl
     icuuc
     )
 elseif(CMAKE_SYSTEM_NAME STREQUAL Darwin)
   set(lib_target "${lib_target}"
-    Chakra.Pal
     pthread
     stdc++
     dl
diff --git a/bin/ch/CMakeLists.txt b/bin/ch/CMakeLists.txt
@@ -45,12 +45,14 @@ if(STATIC_LIBRARY)
       Chakra.Jsrt
       Chakra.Jsrt.Core
       -Wl,--no-whole-archive
+      Chakra.Pal
       )
   elseif(CMAKE_SYSTEM_NAME STREQUAL Darwin)
     set(lib_target
       -Wl,-undefined,error
       Chakra.Jsrt
       Chakra.Jsrt.Core
+      Chakra.Pal
       )
   else()
     message("This platform is not yet supported")
@@ -85,15 +87,13 @@ if(STATIC_LIBRARY)
     if(CMAKE_SYSTEM_NAME STREQUAL Linux)
       set(lib_target "${lib_target}"
         -Wl,--end-group
-        Chakra.Pal
         pthread
         stdc++
         dl
         icuuc
         )
     elseif(CMAKE_SYSTEM_NAME STREQUAL Darwin)
       set(lib_target "${lib_target}"
-        Chakra.Pal
         pthread
         stdc++
         dl
diff --git a/lib/Common/CommonPal.h b/lib/Common/CommonPal.h
@@ -27,6 +27,19 @@
     #define __forceinline inline
 #endif
 
+#ifdef __clang__
+#define CLANG_WNO_BEGIN_(x) \
+    _Pragma("clang diagnostic push")\
+    _Pragma(#x)
+
+#define CLANG_WNO_BEGIN(x) CLANG_WNO_BEGIN_(clang diagnostic ignored x)
+#define CLANG_WNO_END
+    _Pragma("clang diagnostic pop")
+#else
+#define CLANG_WNO_BEGIN(x)
+#define CLANG_WNO_END
+#endif
+
 #ifdef _WIN32
 #pragma warning(push)
 #pragma warning(disable: 4995) /* 'function': name was marked as #pragma deprecated */
diff --git a/lib/Common/Core/ConfigParser.h b/lib/Common/Core/ConfigParser.h
@@ -31,8 +31,11 @@ class ConfigParser
     static const int MaxRegSize = 2048;
     static const LPWSTR featureKeyName ;
     bool _hasReadConfig;
+
+    CLANG_WNO_BEGIN("-Wunused-private-field")
     Js::ConfigFlagsTable& _flags;
     const LPCWSTR _configFileName;
+    CLANG_WNO_END
 
     // NT version of CRT has the "backward compat" behavior that returns 0 instead of EOF
     // for unicode version of fwscanf.
diff --git a/lib/Common/Exceptions/Throw.cpp b/lib/Common/Exceptions/Throw.cpp
@@ -256,7 +256,7 @@ namespace Js {
     }
 
 #ifdef ENABLE_DEBUG_CONFIG_OPTIONS
-    static const char16 * caption = _u("CHAKRA ASSERT");
+#define CHAKRA_ASSERT_CAPTION _u("CHAKRA ASSERT")
 #endif
 
     bool Throw::ReportAssert(__in LPCSTR fileName, uint lineNumber, __in LPCSTR error, __in LPCSTR message)
@@ -301,7 +301,7 @@ namespace Js {
             swprintf_s(buff, _countof(buff), _u("%S (%u)\n%S\n%S"), fileName, lineNumber, message, error);
             buff[_countof(buff)-1] = 0;
 
-            int ret = MessageBox(nullptr, buff, caption, MB_ABORTRETRYIGNORE);
+            int ret = MessageBox(nullptr, buff, CHAKRA_ASSERT_CAPTION, MB_ABORTRETRYIGNORE);
 
             switch (ret)
             {
diff --git a/lib/Common/PlatformAgnostic/DateTime.h b/lib/Common/PlatformAgnostic/DateTime.h
@@ -66,7 +66,10 @@ namespace DateTime
 
     class DaylightTimeHelper
     {
+    CLANG_WNO_BEGIN("-Wunused-private-field")
         DaylightTimeHelperPlatformData data;
+    CLANG_WNO_END
+
     public:
         double UtcToLocal(double utcTime, int &bias, int &offset, bool &isDaylightSavings);
         double LocalToUtc(double time);
diff --git a/lib/Common/TemplateParameter.h b/lib/Common/TemplateParameter.h
@@ -17,15 +17,19 @@ namespace TemplateParameter
     private:
         static void Constrain(T *const t)
         {
+CLANG_WNO_BEGIN("-Wunused-variable")
 #pragma warning(suppress: 4189) // C4189: local variable is initialized but not referenced
             Base *const b = t;
+CLANG_WNO_END
         }
 
     public:
         SameOrDerivedFrom()
         {
+CLANG_WNO_BEGIN("-Wunused-variable")
 #pragma warning(suppress: 4189) // C4189: local variable is initialized but not referenced
             void (*const p)(T *const t) = Constrain;
+CLANG_WNO_END
         }
     };
 
diff --git a/lib/Runtime/Library/JSONString.h b/lib/Runtime/Library/JSONString.h
@@ -96,15 +96,15 @@ namespace Js
                 {
                     if (wch < _countof(escapeMap))
                     {
-                        extra = UInt32Math::Add(extra, escapeMapCount[(char)wch]);
+                        extra = UInt32Math::Add(extra, escapeMapCount[static_cast<int>((char)wch)]);
                     }
                 }
                 else
                 {
                     WCHAR specialChar;
                     if (wch < _countof(escapeMap))
                     {
-                        specialChar = escapeMap[(char)wch];
+                        specialChar = escapeMap[static_cast<int>((char)wch)];
                     }
                     else
                     {
diff --git a/pal/inc/pal.h b/pal/inc/pal.h
@@ -599,12 +599,6 @@ PALAPI
 PAL_InitializeDebug(
     void);
 
-PALIMPORT
-HINSTANCE
-PALAPI
-PAL_RegisterModule(
-    IN LPCSTR lpLibFileName);
-
 PALIMPORT
 VOID
 PALAPI
diff --git a/pal/src/init/pal.cpp b/pal/src/init/pal.cpp
@@ -572,9 +572,6 @@ Initialize(
         ASSERT("returning failure, but last error not set\n");
     }
 
-#ifdef __APPLE__
-exit :
-#endif // __APPLE__
     LOGEXIT("PAL_Initialize returns int %d\n", retval);
     return retval;
 }
diff --git a/pal/src/loader/module.cpp b/pal/src/loader/module.cpp
@@ -677,46 +677,6 @@ PAL_RegisterLibraryDirect(
     return hModule;
 }
 
-/*++
-Function:
-  PAL_RegisterModule
-
-  Register the module with the target module and return a module handle in
-  the target module's context. Doesn't call the DllMain because it is used
-  as part of calling DllMain in the calling module.
-
---*/
-HINSTANCE
-PALAPI
-PAL_RegisterModule(
-    IN LPCSTR lpLibFileName)
-{
-    HINSTANCE hinstance = nullptr;
-
-    int err = PAL_InitializeDLL();
-    if (err == 0)
-    {
-        PERF_ENTRY(PAL_RegisterModule);
-        ENTRY("PAL_RegisterModule(%s)\n", lpLibFileName ? lpLibFileName : "");
-
-        LockModuleList();
-
-        void *dl_handle = LOADLoadLibraryDirect(lpLibFileName);
-        if (dl_handle)
-        {
-            // This only creates/adds the module handle and doesn't call DllMain
-            hinstance = LOADAddModule(dl_handle, lpLibFileName);
-        }
-
-        UnlockModuleList();
-
-        LOGEXIT("PAL_RegisterModule returns HINSTANCE %p\n", hinstance);
-        PERF_EXIT(PAL_RegisterModule);
-    }
-
-    return hinstance;
-}
-
 /*++
 Function:
   PAL_UnregisterModule
diff --git a/pal/src/safecrt/vsprintf.c b/pal/src/safecrt/vsprintf.c
@@ -25,7 +25,6 @@
 typedef int (*OUTPUTFN)(miniFILE *, const char *, va_list);
 
 static int _vsnprintf_helper( OUTPUTFN outfn, char *string, size_t count, const char *format, va_list ap );
-static int _vscprintf_helper ( OUTPUTFN outfn, const char *format, va_list ap);
 
 /***
 *ifndef _COUNT_
@@ -222,45 +221,3 @@ int __cdecl _vsnprintf_s (
 
     return (retvalue < 0 ? -1 : retvalue);
 }
-
-/***
-* _vscprintf() - counts the number of character needed to print the formatted
-* data
-*
-*Purpose:
-*       Counts the number of characters in the fotmatted data.
-*
-*Entry:
-*       char *format - format string, describes format of data
-*       va_list ap - varargs argument pointer
-*
-*Exit:
-*       returns number of characters needed to print formatted data.
-*
-*Exceptions:
-*
-*******************************************************************************/
-
-#ifndef _COUNT_
-
-int __cdecl _vscprintf_helper (
-        OUTPUTFN outfn,
-        const char *format,
-        va_list ap
-        )
-{
-        miniFILE str;
-        miniFILE *outfile = &str;
-        int retval;
-
-        _VALIDATE_RETURN( (format != NULL), EINVAL, -1);
-
-        outfile->_cnt = INT_MAX; //MAXSTR;
-        outfile->_flag = _IOWRT|_IOSTRG;
-        outfile->_ptr = outfile->_base = NULL;
-
-        retval = outfn(outfile, format, ap);
-        return(retval);
-}
-
-#endif  /* _COUNT_ */

Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ namespace Js {`
`256`	`256`	`}`
`257`	`257`
`258`	`258`	`#ifdef ENABLE_DEBUG_CONFIG_OPTIONS`
`259`		`- static const char16 * caption = _u("CHAKRA ASSERT");`
	`259`	`+#define CHAKRA_ASSERT_CAPTION _u("CHAKRA ASSERT")`
`260`	`260`	`#endif`
`261`	`261`
`262`	`262`	`bool Throw::ReportAssert(__in LPCSTR fileName, uint lineNumber, __in LPCSTR error, __in LPCSTR message)`
`@@ -301,7 +301,7 @@ namespace Js {`
`301`	`301`	`swprintf_s(buff, _countof(buff), _u("%S (%u)\n%S\n%S"), fileName, lineNumber, message, error);`
`302`	`302`	`buff[_countof(buff)-1] = 0;`
`303`	`303`
`304`		`- int ret = MessageBox(nullptr, buff, caption, MB_ABORTRETRYIGNORE);`
	`304`	`+ int ret = MessageBox(nullptr, buff, CHAKRA_ASSERT_CAPTION, MB_ABORTRETRYIGNORE);`
`305`	`305`
`306`	`306`	`switch (ret)`
`307`	`307`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,15 +17,19 @@ namespace TemplateParameter`
`17`	`17`	`private:`
`18`	`18`	`static void Constrain(T *const t)`
`19`	`19`	`{`
	`20`	`+CLANG_WNO_BEGIN("-Wunused-variable")`
`20`	`21`	`#pragma warning(suppress: 4189) // C4189: local variable is initialized but not referenced`
`21`	`22`	`Base *const b = t;`
	`23`	`+CLANG_WNO_END`
`22`	`24`	`}`
`23`	`25`
`24`	`26`	`public:`
`25`	`27`	`SameOrDerivedFrom()`
`26`	`28`	`{`
	`29`	`+CLANG_WNO_BEGIN("-Wunused-variable")`
`27`	`30`	`#pragma warning(suppress: 4189) // C4189: local variable is initialized but not referenced`
`28`	`31`	`void (const p)(T const t) = Constrain;`
	`32`	`+CLANG_WNO_END`
`29`	`33`	`}`
`30`	`34`	`};`
`31`	`35`
Original file line number	Diff line number	Diff line change
`@@ -96,15 +96,15 @@ namespace Js`
`96`	`96`	`{`
`97`	`97`	`if (wch < _countof(escapeMap))`
`98`	`98`	`{`
`99`		`- extra = UInt32Math::Add(extra, escapeMapCount[(char)wch]);`
	`99`	`+ extra = UInt32Math::Add(extra, escapeMapCount[static_cast<int>((char)wch)]);`
`100`	`100`	`}`
`101`	`101`	`}`
`102`	`102`	`else`
`103`	`103`	`{`
`104`	`104`	`WCHAR specialChar;`
`105`	`105`	`if (wch < _countof(escapeMap))`
`106`	`106`	`{`
`107`		`- specialChar = escapeMap[(char)wch];`
	`107`	`+ specialChar = escapeMap[static_cast<int>((char)wch)];`
`108`	`108`	`}`
`109`	`109`	`else`
`110`	`110`	`{`