[compiler-rt] 9adc907 - [sanitizer][NFC] Fix compilation error on Windows

[Vitaly Buka via llvm-commits]

Author: Vitaly Buka
Date: 2021-03-16T15:04:30-07:00
New Revision: 9adc9073633949b52b4cade4613c89473e99b83e

URL: https://github.com/llvm/llvm-project/commit/9adc9073633949b52b4cade4613c89473e99b83e
DIFF: https://github.com/llvm/llvm-project/commit/9adc9073633949b52b4cade4613c89473e99b83e.diff

LOG: [sanitizer][NFC] Fix compilation error on Windows

And remove unnecessary const_cast in ubsan.

Added: 
    

Modified: 
    compiler-rt/lib/sanitizer_common/sanitizer_common.h
    compiler-rt/lib/ubsan/ubsan_monitor.cpp

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/sanitizer_common/sanitizer_common.h b/compiler-rt/lib/sanitizer_common/sanitizer_common.h
index a9ecd2ad2da5..5e112dfd1984 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_common.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_common.h
@@ -605,6 +605,7 @@ class InternalScopedString {
   }
   void append(const char *format, ...);
   const char *data() const { return buffer_.data(); }
+  char *data() { return buffer_.data(); }
 
  private:
   InternalMmapVector<char> buffer_;

diff  --git a/compiler-rt/lib/ubsan/ubsan_monitor.cpp b/compiler-rt/lib/ubsan/ubsan_monitor.cpp
index 0b0ab50d6ecc..0a25c099ad6c 100644
--- a/compiler-rt/lib/ubsan/ubsan_monitor.cpp
+++ b/compiler-rt/lib/ubsan/ubsan_monitor.cpp
@@ -54,7 +54,7 @@ void __ubsan::__ubsan_get_current_report_data(const char **OutIssueKind,
   // lowercase letter.
   char FirstChar = *Buf.data();
   if (FirstChar >= 'a' && FirstChar <= 'z')
-    *const_cast<char *>(Buf.data()) += 'A' - 'a';
+    *Buf.data() += 'A' - 'a';
 
   *OutIssueKind = CurrentUBR->IssueKind;
   *OutMessage = Buf.data();