Fix ProjectN build breaks (dotnet#7405)

bilenkonito · May 8, 2019 · fd3a3e4 · fd3a3e4
1 parent 8bf4862
commit fd3a3e4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/src/Native/Runtime/gcrhenv.cpp b/src/Native/Runtime/gcrhenv.cpp
@@ -1073,7 +1073,11 @@ void GCToEEInterface::DisablePreemptiveGC(Thread * pThread)
 
 Thread* GCToEEInterface::GetThread()
 {
+#ifndef DACCESS_COMPILE
     return ::GetThread();
+#else
+    return NULL;
+#endif
 }
 
 bool GCToEEInterface::TrapReturningThreads()
@@ -1593,6 +1597,8 @@ bool GCToEEInterface::GetIntConfigValue(const char* key, int64_t* value)
 
 bool GCToEEInterface::GetStringConfigValue(const char* key, const char** value)
 {
+    UNREFERENCED_PARAMETER(key);
+    UNREFERENCED_PARAMETER(value);
     return false;
 }
 

diff --git a/src/Native/gc/gc.cpp b/src/Native/gc/gc.cpp
@@ -15242,20 +15242,20 @@ void fire_overflow_event (uint8_t* overflow_min,
 
 void gc_heap::concurrent_print_time_delta (const char* msg)
 {
+    UNREFERENCED_PARAMETER(msg);
 #ifdef TRACE_GC
     size_t current_time = GetHighPrecisionTimeStamp();
     size_t elapsed_time = current_time - time_bgc_last;
     time_bgc_last = current_time;
 
     dprintf (2, ("h%d: %s T %Id ms", heap_number, msg, elapsed_time));
-#else
-    UNREFERENCED_PARAMETER(msg);
 #endif //TRACE_GC
 }
 
 void gc_heap::free_list_info (int gen_num, const char* msg)
 {
     UNREFERENCED_PARAMETER(gen_num);
+    UNREFERENCED_PARAMETER(msg);
 #if defined (BACKGROUND_GC) && defined (TRACE_GC)
     dprintf (3, ("h%d: %s", heap_number, msg));
     for (int i = 0; i <= (max_generation + 1); i++)
@@ -15276,8 +15276,6 @@ void gc_heap::free_list_info (int gen_num, const char* msg)
                 generation_free_obj_space (gen)));
         }
     }
-#else
-    UNREFERENCED_PARAMETER(msg);
 #endif // BACKGROUND_GC && TRACE_GC
 }
 
@@ -23737,6 +23735,7 @@ void gc_heap::relocate_survivor_helper (uint8_t* plug, uint8_t* plug_end)
 // if we expanded, right now we are not handling it as We are not saving the new reloc info.
 void gc_heap::verify_pins_with_post_plug_info (const char* msg)
 {
+    UNREFERENCED_PARAMETER(msg);
 #if defined  (_DEBUG) && defined (VERIFY_HEAP)
     if (GCConfig::GetHeapVerifyLevel() & GCConfig::HEAPVERIFY_GC)
     {
@@ -23789,8 +23788,6 @@ void gc_heap::verify_pins_with_post_plug_info (const char* msg)
 
         dprintf (3, ("%s verified", msg));
     }
-#else // _DEBUG && VERIFY_HEAP
-    UNREFERENCED_PARAMETER(msg);
 #endif // _DEBUG && VERIFY_HEAP
 }
 

diff --git a/src/Native/gc/handletable.cpp b/src/Native/gc/handletable.cpp
@@ -1310,6 +1310,8 @@ BOOL  Ref_HandleAsyncPinHandles(async_pin_enum_fn asyncPinCallback, void* contex
 
     return result;
 #else
+    UNREFERENCED_PARAMETER(asyncPinCallback);
+    UNREFERENCED_PARAMETER(context);
     return true;
 #endif // !FEATURE_REDHAWK
 }
@@ -1329,6 +1331,9 @@ void  Ref_RelocateAsyncPinHandles(HandleTableBucket *pSource, HandleTableBucket
     {
         TableRelocateAsyncPinHandles(Table(pSource->pTable[n]), Table(pTarget->pTable[n]));
     }
+#else
+    UNREFERENCED_PARAMETER(pSource);
+    UNREFERENCED_PARAMETER(pTarget);
 #endif // !FEATURE_REDHAWK
 }