ARM64 CFI support replace unreached with assert

RalfKornmannEnvision · Aug 20, 2020 · 8616edb · 8616edb
1 parent b4b0215
commit 8616edb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/coreclr/src/jit/unwindarm64.cpp b/src/coreclr/src/jit/unwindarm64.cpp
@@ -623,10 +623,8 @@ void Compiler::unwindSaveRegPreindexed(regNumber reg, int offset)
 void Compiler::unwindSaveNext()
 {
 #if defined(TARGET_UNIX)
-    if (generateCFIUnwindCodes())
-    {
-        unreached(); // do not use unwindSaveNext when generating CFI codes as there is no code for this
-    }
+    // do not use unwindSaveNext when generating CFI codes as there is no code for this
+    assert(!generateCFIUnwindCodes());
 #endif // TARGET_UNIX
 
     UnwindInfo* pu = &funCurrentFunc()->uwi;

diff --git a/src/libraries/Native/Unix/Common/pal_io_common.h b/src/libraries/Native/Unix/Common/pal_io_common.h
@@ -90,7 +90,7 @@ inline static int32_t Common_Poll(PollEvent* pollEvents, uint32_t eventCount, in
     }
     else
     {
-        pollfds = calloc(eventCount, sizeof(*pollfds));
+        pollfds = (pollfd*)calloc(eventCount, sizeof(*pollfds));
         if (pollfds == NULL)
         {
             return Error_ENOMEM;