commit b3287af10e2236989c706a184376332566ad9140
author Ryan Macnak <rmacnak@google.com> Thu May 16 16:33:52 2024 +0000
committer Commit Queue <dart-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu May 16 16:33:52 2024 +0000
tree a0c6a8b4d179a7653c6dee8f795e2a6cd78f04e7
parent 8b5b1571aefafd361fba007226826dbb90053db3

[vm] Remove MSAN_UNPOISONs around print and sort functions.

This was probably fixed by ddc11f8084536784fdbea727be4585c34191f3fd.

TEST=msan
Change-Id: I05f58b382ad186929bd4dbf56e905568cb268d96
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/366683
Reviewed-by: Alexander Aprelev <aam@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>

runtime/bin/dart_embedder_api_impl.cc

diff --git a/runtime/bin/dart_embedder_api_impl.cc b/runtime/bin/dart_embedder_api_impl.cc
index e897613..496ab23 100644
--- a/runtime/bin/dart_embedder_api_impl.cc
+++ b/runtime/bin/dart_embedder_api_impl.cc
@@ -23,7 +23,6 @@
   va_end(measure_args);
 
   char* buffer = reinterpret_cast<char*>(malloc(len + 1));
-  MSAN_UNPOISON(buffer, (len + 1));
   va_list print_args;
   va_start(print_args, format);
   Utils::VSNPrint(buffer, (len + 1), format, print_args);

runtime/bin/dartutils.cc

diff --git a/runtime/bin/dartutils.cc b/runtime/bin/dartutils.cc
index 4ec82d0..99ec1c9 100644
--- a/runtime/bin/dartutils.cc
+++ b/runtime/bin/dartutils.cc
@@ -774,7 +774,6 @@
   va_end(measure_args);
 
   char* buffer = reinterpret_cast<char*>(Dart_ScopeAllocate(len + 1));
-  MSAN_UNPOISON(buffer, (len + 1));
   va_list print_args;
   va_start(print_args, format);
   Utils::VSNPrint(buffer, (len + 1), format, print_args);
@@ -805,7 +804,6 @@
   va_end(measure_args);
 
   char* buffer = ScopedCString(len + 1);
-  MSAN_UNPOISON(buffer, (len + 1));
   va_list print_args;
   va_copy(print_args, args);
   len = Utils::VSNPrint(buffer, (len + 1), format, print_args);

runtime/platform/assert.cc

diff --git a/runtime/platform/assert.cc b/runtime/platform/assert.cc
index 63aa05f..a0ebbcc 100644
--- a/runtime/platform/assert.cc
+++ b/runtime/platform/assert.cc
@@ -26,7 +26,6 @@
 
   // Print the file and line number into the buffer.
   char buffer[4 * KB];
-  MSAN_UNPOISON(buffer, sizeof(buffer));
   intptr_t file_and_line_length =
       snprintf(buffer, sizeof(buffer), "%s: %d: error: ", file, line_);
 

runtime/platform/utils_linux.cc

diff --git a/runtime/platform/utils_linux.cc b/runtime/platform/utils_linux.cc
index 133ce56..1a45499 100644
--- a/runtime/platform/utils_linux.cc
+++ b/runtime/platform/utils_linux.cc
@@ -33,7 +33,6 @@
 }
 
 int Utils::VSNPrint(char* str, size_t size, const char* format, va_list args) {
-  MSAN_UNPOISON(str, size);
   int retval = vsnprintf(str, size, format, args);
   if (retval < 0) {
     FATAL("Fatal error in Utils::VSNPrint with format '%s'", format);

runtime/vm/compiler/backend/il.cc

diff --git a/runtime/vm/compiler/backend/il.cc b/runtime/vm/compiler/backend/il.cc
index ff80294..4ad918f 100644
--- a/runtime/vm/compiler/backend/il.cc
+++ b/runtime/vm/compiler/backend/il.cc
@@ -246,10 +246,6 @@
 
   qsort(cids_array, cids.length(), sizeof(intptr_t),
         [](const void* a, const void* b) {
-          // MSAN seems unaware of allocations inside qsort. The linker flag
-          // -fsanitize=memory should give us a MSAN-aware version of libc...
-          MSAN_UNPOISON(static_cast<const intptr_t*>(a), sizeof(intptr_t));
-          MSAN_UNPOISON(static_cast<const intptr_t*>(b), sizeof(intptr_t));
           return static_cast<int>(*static_cast<const intptr_t*>(a) -
                                   *static_cast<const intptr_t*>(b));
         });

runtime/vm/native_symbol_posix.cc

diff --git a/runtime/vm/native_symbol_posix.cc b/runtime/vm/native_symbol_posix.cc
index 426a61c..2d262ed 100644
--- a/runtime/vm/native_symbol_posix.cc
+++ b/runtime/vm/native_symbol_posix.cc
@@ -137,7 +137,6 @@
   int status = 0;
   size_t len = 0;
   char* demangled = abi::__cxa_demangle(info.dli_sname, nullptr, &len, &status);
-  MSAN_UNPOISON(demangled, len);
   if (status == 0) {
     return demangled;
   }