1 files changed, 9 insertions, 9 deletions

diff --git a/compiler-rt/test/scudo/sizes.cpp b/compiler-rt/test/scudo/sizes.cpp
index 73fc71f25c5..a5e48a25040 100644
--- a/compiler-rt/test/scudo/sizes.cpp
+++ b/compiler-rt/test/scudo/sizes.cpp
@@ -21,10 +21,10 @@
 #include <limits>
 #include <new>
 
+#include <sanitizer/allocator_interface.h>
+
 int main(int argc, char **argv) {
   assert(argc == 2);
-  const char *action = argv[1];
-  fprintf(stderr, "%s:\n", action);
 
 #if __LP64__ || defined(_WIN64)
   static const size_t kMaxAllowedMallocSize = 1ULL << 40;
@@ -34,32 +34,32 @@ int main(int argc, char **argv) {
   static const size_t kChunkHeaderSize = 8;
 #endif
 
-  if (!strcmp(action, "malloc")) {
+  if (!strcmp(argv[1], "malloc")) {
     void *p = malloc(kMaxAllowedMallocSize);
     assert(!p);
     p = malloc(kMaxAllowedMallocSize - kChunkHeaderSize);
     assert(!p);
-  } else if (!strcmp(action, "calloc")) {
+  } else if (!strcmp(argv[1], "calloc")) {
     // Trigger an overflow in calloc.
     size_t size = std::numeric_limits<size_t>::max();
     void *p = calloc((size / 0x1000) + 1, 0x1000);
     assert(!p);
-  } else if (!strcmp(action, "new")) {
+  } else if (!strcmp(argv[1], "new")) {
     void *p = operator new(kMaxAllowedMallocSize);
     assert(!p);
-  } else if (!strcmp(action, "new-nothrow")) {
+  } else if (!strcmp(argv[1], "new-nothrow")) {
     void *p = operator new(kMaxAllowedMallocSize, std::nothrow);
     assert(!p);
-  } else if (!strcmp(action, "usable")) {
+  } else if (!strcmp(argv[1], "usable")) {
     // Playing with the actual usable size of a chunk.
     void *p = malloc(1007);
     assert(p);
-    size_t size = malloc_usable_size(p);
+    size_t size = __sanitizer_get_allocated_size(p);
     assert(size >= 1007);
     memset(p, 'A', size);
     p = realloc(p, 2014);
     assert(p);
-    size = malloc_usable_size(p);
+    size = __sanitizer_get_allocated_size(p);
     assert(size >= 2014);
     memset(p, 'B', size);
     free(p);