From 4f02a32fb7d01e9143ad4d1a2b34ffdd9cb1c728 Mon Sep 17 00:00:00 2001
From: TB Schardl <neboat@mit.edu>
Date: Sun, 23 Aug 2020 15:20:51 +0000
Subject: [PATCH] [cilksan][cilkscale] Update to match OpenCilk runtime API
 changes.

---
 compiler-rt/lib/cilksan/drivercsan.cpp  | 18 ++++++++++--------
 compiler-rt/lib/cilkscale/cilkscale.cpp |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/compiler-rt/lib/cilksan/drivercsan.cpp b/compiler-rt/lib/cilksan/drivercsan.cpp
index 99b9b72fcd32..e2d61dc59bf7 100644
--- a/compiler-rt/lib/cilksan/drivercsan.cpp
+++ b/compiler-rt/lib/cilksan/drivercsan.cpp
@@ -1232,13 +1232,13 @@ struct __cilkrts_worker;
 
 // Wrapped __cilkrts_internal_merge_two_rmaps method for dynamic
 // interpositioning.
-typedef cilkred_map *(*merge_two_rmaps_t)(__cilkrts_worker *const,
-                                          cilkred_map *, cilkred_map *);
+typedef cilkred_map *(*merge_two_rmaps_t)(__cilkrts_worker *, cilkred_map *,
+                                          cilkred_map *);
 static merge_two_rmaps_t dl_merge_two_rmaps = NULL;
 
 CILKSAN_API __attribute__((weak)) cilkred_map *
-__cilkrts_internal_merge_two_rmaps(__cilkrts_worker *const ws,
-                                   cilkred_map *left, cilkred_map *right) {
+__cilkrts_internal_merge_two_rmaps(__cilkrts_worker *ws, cilkred_map *left,
+                                   cilkred_map *right) {
   if (__builtin_expect(dl_merge_two_rmaps == NULL, 0)) {
     dl_merge_two_rmaps = (merge_two_rmaps_t)dlsym(
         RTLD_NEXT, "__cilkrts_internal_merge_two_rmaps");
@@ -1256,17 +1256,19 @@ __cilkrts_internal_merge_two_rmaps(__cilkrts_worker *const ws,
   return res;
 }
 
-/// Wrapped __cilkrts_internal_merge_two_rmaps method for link-time interpositioning.
+/// Wrapped __cilkrts_internal_merge_two_rmaps method for link-time
+/// interpositioning.
 CILKSAN_API __attribute__((weak)) cilkred_map *
-__real___cilkrts_internal_merge_two_rmaps(__cilkrts_worker *const ws,
+__real___cilkrts_internal_merge_two_rmaps(__cilkrts_worker *ws,
                                           cilkred_map *left,
                                           cilkred_map *right) {
   return __cilkrts_internal_merge_two_rmaps(ws, left, right);
 }
 
 CILKSAN_API
-cilkred_map *__wrap___cilkrts_internal_merge_two_rmaps(
-    __cilkrts_worker *const ws, cilkred_map *left, cilkred_map *right) {
+cilkred_map *__wrap___cilkrts_internal_merge_two_rmaps(__cilkrts_worker *ws,
+                                                       cilkred_map *left,
+                                                       cilkred_map *right) {
   disable_checking();
   cilkred_map *res = __real___cilkrts_internal_merge_two_rmaps(ws, left, right);
   enable_checking();
diff --git a/compiler-rt/lib/cilkscale/cilkscale.cpp b/compiler-rt/lib/cilkscale/cilkscale.cpp
index 9f9a691e4a3f..c10c33f979a1 100644
--- a/compiler-rt/lib/cilkscale/cilkscale.cpp
+++ b/compiler-rt/lib/cilkscale/cilkscale.cpp
@@ -34,7 +34,7 @@
 #include <cilk/reducer_ostream.h>
 #endif
 
-extern int __cilkrts_get_worker_number(void);
+extern unsigned __cilkrts_get_worker_number(void);
 
 ///////////////////////////////////////////////////////////////////////////
 // Data structures for tracking work and span.