--- xnu/xnu-12377.101.15/libkern/c++/OSMetaClass.cpp
+++ xnu/xnu-8019.61.5/libkern/c++/OSMetaClass.cpp
@@ -433,7 +433,7 @@
 {
 public:
 	OSMetaClassMeta();
-	OSObject * alloc() const override;
+	OSObject * alloc() const;
 };
 OSMetaClassMeta::OSMetaClassMeta()
 	: OSMetaClass("OSMetaClass", NULL, sizeof(OSMetaClass))
@@ -1106,7 +1106,7 @@
         maxDepth = sDeepestClass;
         if (maxDepth > kLocalDepth) {
                 nextIndex = IONewData(typeof(nextIndex[0]), maxDepth);
-                sets      = IONew(typeof(sets[0]), maxDepth);
+                sets      = IONewData(typeof(sets[0]), maxDepth);
 	}
         done = false;
         level = 0;
@@ -1138,7 +1138,7 @@
 	}while (!done);
         if (maxDepth > kLocalDepth) {
                 IODeleteData(nextIndex, typeof(nextIndex[0]), maxDepth);
-                IODelete(sets, typeof(sets[0]), maxDepth);
+                IODeleteData(sets, typeof(sets[0]), maxDepth);
 	}
 }
 
@@ -1545,15 +1545,12 @@
 
 #if IOTRACKING
 
-__typed_allocators_ignore_push
-
 void *
 OSMetaClass::trackedNew(size_t size)
 {
         IOTracking * mem;
 
-        mem = (typeof(mem))kheap_alloc(KHEAP_DEFAULT, size + sizeof(IOTracking),
-            Z_VM_TAG_BT(Z_WAITOK, VM_KERN_MEMORY_LIBKERN));
+        mem = (typeof(mem))kalloc_tag_bt(size + sizeof(IOTracking), VM_KERN_MEMORY_LIBKERN);
         assert(mem);
         if (!mem) {
                 return mem;
@@ -1572,11 +1569,9 @@
 {
         IOTracking * mem = (typeof(mem))instance; mem--;
 
-        kheap_free(KHEAP_DEFAULT, mem, size + sizeof(IOTracking));
+        kfree(mem, size + sizeof(IOTracking));
         OSIVAR_ACCUMSIZE(-size);
 }
-
-__typed_allocators_ignore_pop
 
 void
 OSMetaClass::trackedInstance(OSObject * instance) const