summaryrefslogtreecommitdiffstats
path: root/compiler-rt/lib
diff options
context:
space:
mode:
authorEvgenii Stepanov <eugenis@google.com>2019-12-26 12:27:29 -0800
committerEvgenii Stepanov <eugenis@google.com>2019-12-26 12:29:48 -0800
commit04926e67fda210c9709da4f8672ac0b5147ebb90 (patch)
treef97c6141ccecf49b8dc1c1e95a8ace863ac7b43e /compiler-rt/lib
parent831b636861ea33c3cc1c1c28384fb1800facf792 (diff)
downloadbcm5719-llvm-04926e67fda210c9709da4f8672ac0b5147ebb90.tar.gz
bcm5719-llvm-04926e67fda210c9709da4f8672ac0b5147ebb90.zip
Revert "[msan] Check qsort input."
This change breaks LLVM bootstrap with ASan and MSan. FAILED: lib/ToolDrivers/llvm-lib/Options.inc OptParser.td:137:1: error: Option is equivalent to def INPUT : Option<[], "<input>", KIND_INPUT>; ^ OptParser.td:137:1: error: Other defined here def INPUT : Option<[], "<input>", KIND_INPUT>; This reverts commit caa48a6b88aeed8ae80e6ddb1eae8c6a7cbe260b.
Diffstat (limited to 'compiler-rt/lib')
-rw-r--r--compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc18
1 files changed, 0 insertions, 18 deletions
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc
index 68a9db5bba7..2d9636a9c87 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc
@@ -9665,15 +9665,6 @@ INTERCEPTOR(void, qsort, void *base, SIZE_T nmemb, SIZE_T size,
qsort_compar_f compar) {
void *ctx;
COMMON_INTERCEPTOR_ENTER(ctx, qsort, base, nmemb, size, compar);
- // Run the comparator over all array elements to detect any memory issues.
- for (SIZE_T i = 0; i < nmemb; ++i) {
- void *p = (void *)((char *)base + i * size);
- COMMON_INTERCEPTOR_UNPOISON_PARAM(2);
- // Compare each element with itself to trigger an equality check, which
- // typically requires the comparator to look as many of the object fields as
- // possible.
- compar(p, p);
- }
qsort_compar_f old_compar = qsort_compar;
qsort_compar = compar;
SIZE_T old_size = qsort_size;
@@ -9703,15 +9694,6 @@ INTERCEPTOR(void, qsort_r, void *base, SIZE_T nmemb, SIZE_T size,
qsort_r_compar_f compar, void *arg) {
void *ctx;
COMMON_INTERCEPTOR_ENTER(ctx, qsort_r, base, nmemb, size, compar, arg);
- // Run the comparator over all array elements to detect any memory issues.
- for (SIZE_T i = 0; i < nmemb; ++i) {
- void *p = (void *)((char *)base + i * size);
- COMMON_INTERCEPTOR_UNPOISON_PARAM(3);
- // Compare each element with itself to trigger an equality check, which
- // typically requires the comparator to look as many of the object fields as
- // possible.
- compar(p, p, arg);
- }
qsort_r_compar_f old_compar = qsort_r_compar;
qsort_r_compar = compar;
SIZE_T old_size = qsort_r_size;
OpenPOWER on IntegriCloud