build: fix build on macos and fix crash on exit

PrivateHeap is causing crash on exit due to node picking up chakracore's overridden new and delete operators. For now fix by disabling PrivateHeap.
nodejs · Nov 24, 2016 · 4c73217 · 4c73217
1 parent 5c0da90
commit 4c73217
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 25 deletions.
diff --git a/deps/chakrashim/chakrashim.gyp b/deps/chakrashim/chakrashim.gyp
@@ -38,6 +38,14 @@
         [ 'OS in "linux"', {
           'cflags_cc': [ '-fexceptions' ],
         }],
+        [ 'OS in "mac"', {
+          'cflags_cc': [ '-fexceptions' ],
+          'cflags_cc!': [ '-fno-exceptions' ],
+          'xcode_settings': {
+            'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
+            'OTHER_CFLAGS': [ '-fexceptions' ],
+          },
+        }],
       ],
       'msvs_use_library_dependency_inputs': 1,
 

diff --git a/deps/chakrashim/core/lib/Common/ConfigFlagsList.h b/deps/chakrashim/core/lib/Common/ConfigFlagsList.h
@@ -648,7 +648,7 @@ PHASE(All)
 #define DEFAULT_CONFIG_EnumerationCompat    (false)
 #define DEFAULT_CONFIG_ConcurrentRuntime (false)
 #define DEFAULT_CONFIG_PrimeRecycler     (false)
-#define DEFAULT_CONFIG_PrivateHeap       (true)
+#define DEFAULT_CONFIG_PrivateHeap       (false)
 #define DEFAULT_CONFIG_DisableRentalThreading (false)
 #define DEFAULT_CONFIG_DisableDebugObject (false)
 #define DEFAULT_CONFIG_DumpHeap (false)

diff --git a/deps/chakrashim/src/jsrtisolateshim.cc b/deps/chakrashim/src/jsrtisolateshim.cc
@@ -395,7 +395,7 @@ bool CALLBACK TTReadBytesFromStreamCallback(JsTTDStreamHandle handle,
         return false;
     }
 
-    bool ok = FALSE;
+    bool ok = false;
     *readCount = TTDHostRead(buff, size, (FILE*)handle);
     ok = (*readCount != 0);
 
@@ -411,7 +411,7 @@ bool CALLBACK TTWriteBytesToStreamCallback(JsTTDStreamHandle handle,
         return false;
     }
 
-    bool ok = FALSE;
+    bool ok = false;
     *writtenCount = TTDHostWrite(buff, size, (FILE*)handle);
     ok = (*writtenCount == size);
 
@@ -905,8 +905,8 @@ bool IsolateShim::RunSingleStepOfReverseMoveLoop(v8::Isolate* isolate,
     *moveMode = (uint64_t)_moveMode;
     if (*nextEventTime == -1) {
         printf("\nReached end of Execution -- Exiting.\n");
-        return FALSE;
+        return false;
     }
-    return TRUE;
+    return true;
 }
 }  // namespace jsrt
diff --git a/deps/chakrashim/src/jsrtisolateshim.h b/deps/chakrashim/src/jsrtisolateshim.h
@@ -21,18 +21,16 @@
 #include "uv.h"
 #include <vector>
 
+// CHAKRA-TODO : now that node is using libc++ for C++11 support can we remove
+// all OSX_SDK_TR1 specialization?
 #if !defined(OSX_SDK_TR1) && defined(__APPLE__)
 #include <AvailabilityMacros.h>
 #if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < MAC_OS_X_VERSION_10_9
 #define OSX_SDK_TR1
 #endif
 #endif
 
-#ifdef OSX_SDK_TR1
-#include <tr1/unordered_map>
-#else
 #include <unordered_map>
-#endif
 
 namespace v8 {
 

diff --git a/deps/chakrashim/src/jsrtproxyutils.cc b/deps/chakrashim/src/jsrtproxyutils.cc
@@ -20,6 +20,7 @@
 
 #include "jsrtutils.h"
 #include <string>
+#include <cstdlib>
 #include <assert.h>
 
 namespace jsrt {

diff --git a/deps/chakrashim/src/jsrtutils.cc b/deps/chakrashim/src/jsrtutils.cc
@@ -20,6 +20,7 @@
 
 #include <stdarg.h>
 #include "jsrtutils.h"
+#include <string>
 
 namespace jsrt {
 

diff --git a/deps/chakrashim/src/jsrtutils.h b/deps/chakrashim/src/jsrtutils.h
@@ -45,8 +45,6 @@ inline size_t _countof(T (&)[N]) {
 #ifndef _WIN32
 #define strnicmp strncasecmp
 #define __debugbreak __builtin_trap
-using std::min;
-using std::max;
 #endif
 
 #ifndef __APPLE__

diff --git a/src/node.cc b/src/node.cc
@@ -4656,20 +4656,14 @@ static void StartNodeInstance_TTDReplay(void* arg) {
     ////
     JsTTDStart();
 
-    try {
-        int64_t nextEventTime = -2;
-        bool continueReplayActions = TRUE;
-
-        while (continueReplayActions) {
-            continueReplayActions =
-                v8::Isolate::RunSingleStepOfReverseMoveLoop(isolate,
-                                                            &s_ttdStartupMode,
-                                                            &nextEventTime);
-        }
-    }
-    catch (...) {
-        printf("Terminal exception in Replay -- exiting.");
-        exit(1);
+    int64_t nextEventTime = -2;
+    bool continueReplayActions = true;
+
+    while (continueReplayActions) {
+        continueReplayActions =
+            v8::Isolate::RunSingleStepOfReverseMoveLoop(isolate,
+                                                        &s_ttdStartupMode,
+                                                        &nextEventTime);
     }
     ////