--- dyld/dyld-1284.13/common/Diagnostics.cpp
+++ dyld/dyld-1122.1/common/Diagnostics.cpp
@@ -72,18 +72,18 @@
 {
     va_list    list;
     va_start(list, format);
-    error(format, va_list_wrap(list));
-    va_end(list);
-}
-
-void Diagnostics::error(const char* format, va_list_wrap vaWrap)
-{
-#if TARGET_OS_EXCLAVEKIT
-    vsnprintf(_strBuf, sizeof(_strBuf), format, vaWrap.list);
+    error(format, list);
+    va_end(list);
+}
+
+void Diagnostics::error(const char* format, va_list list)
+{
+#if TARGET_OS_EXCLAVEKIT
+    vsnprintf(_strBuf, sizeof(_strBuf), format, list);
 #else
     if ( _buffer == nullptr )
         _buffer = _simple_salloc();
-    _simple_vsprintf(_buffer, format, vaWrap.list);
+    _simple_vsprintf(_buffer, format, list);
 #endif
 
 #if BUILDING_CACHE_BUILDER || BUILDING_UNIT_TESTS || BUILDING_CACHE_BUILDER_UNIT_TESTS
@@ -111,7 +111,7 @@
         _simple_sresize(_buffer);
     va_list list;
     va_start(list, format);
-    error(format, va_list_wrap(list));
+    error(format, list);
     va_end(list);
 #endif
  }
@@ -299,21 +299,3 @@
 
 #endif
 
-#if BUILDING_LD || BUILDING_UNIT_TESTS || BUILDING_SHARED_CACHE_LINKER || BUILDING_CACHE_BUILDER || BUILDING_CACHE_BUILDER_UNIT_TESTS
-
-mach_o::Error Diagnostics::toError() const
-{
-    if ( hasError() )
-        return mach_o::Error("%s", errorMessageCStr());
-    return mach_o::Error::none();
-}
-
-void Diagnostics::error(const mach_o::Error& err)
-{
-    if ( err.noError() )
-        return;
-
-    error("%s", err.message());
-}
-
-#endif