[PATCH] D71078: scudo: Fix one of the C wrapper tests on Android.

[Peter Collingbourne via Phabricator via llvm-commits]

pcc created this revision.
pcc added a reviewer: cryptoad.
Herald added subscribers: Sanitizers, srhines.
Herald added projects: Sanitizers, LLVM.
pcc added a child revision: D71081: gn build: Add support for building scudo and its unit tests..

The test ScudoWrappersCTest.Realloc expects realloc of memalign to work on
Android, but this relies on dealloc_type_mismatch being set to false. Commit
0d3d4d3b0 <https://reviews.llvm.org/rG0d3d4d3b0fc57e577a8f80261bd4390c6cb7c040> caused us to start setting it to true in the C wrapper tests,
which broke the test. Set it to the correct value on Android.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D71078

Files:
  compiler-rt/lib/scudo/standalone/tests/scudo_unit_test_main.cpp


Index: compiler-rt/lib/scudo/standalone/tests/scudo_unit_test_main.cpp
===================================================================
--- compiler-rt/lib/scudo/standalone/tests/scudo_unit_test_main.cpp
+++ compiler-rt/lib/scudo/standalone/tests/scudo_unit_test_main.cpp
@@ -8,6 +8,14 @@
 
 #include "tests/scudo_unit_test.h"
 
+// Match Android's default configuration, which disables Scudo's mismatch
+// allocation check, as it is being triggered by some third party code.
+#if SCUDO_ANDROID
+#define DEALLOC_TYPE_MISMATCH "false"
+#else
+#define DEALLOC_TYPE_MISMATCH "true"
+#endif
+
 // This allows us to turn on/off a Quarantine for specific tests. The Quarantine
 // parameters are on the low end, to avoid having to loop excessively in some
 // tests.
@@ -15,9 +23,10 @@
 extern "C" __attribute__((visibility("default"))) const char *
 __scudo_default_options() {
   if (!UseQuarantine)
-    return "dealloc_type_mismatch=true";
+    return "dealloc_type_mismatch=" DEALLOC_TYPE_MISMATCH;
   return "quarantine_size_kb=256:thread_local_quarantine_size_kb=128:"
-         "quarantine_max_chunk_size=512:dealloc_type_mismatch=true";
+         "quarantine_max_chunk_size=512:"
+         "dealloc_type_mismatch=" DEALLOC_TYPE_MISMATCH;
 }
 
 int main(int argc, char **argv) {


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D71078.232399.patch
Type: text/x-patch
Size: 1285 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20191205/a66ac77a/attachment.bin>