[PR] vitalybuka - adjusted interface, deleted constructors and removed has_include

Author: cjappl

compiler-rt/include/sanitizer/rtsan_interface.h

@@ -14,11 +14,7 @@
 #ifndef SANITIZER_RTSAN_INTERFACE_H
 #define SANITIZER_RTSAN_INTERFACE_H
 
-#if __has_include(<sanitizer/common_interface_defs.h>)
 #include <sanitizer/common_interface_defs.h>
-#else
-#define SANITIZER_CDECL
-#endif // __has_include(<sanitizer/common_interface_defs.h>)
 
 #ifdef __cplusplus
 extern "C" {
@@ -60,6 +56,16 @@ class ScopedDisabler {
 class ScopedDisabler {
 public:
   ScopedDisabler() {}
+#if __cplusplus >= 201103L
+  ScopedDisabler(const ScopedDisabler &) = delete;
+  ScopedDisabler &operator=(const ScopedDisabler &) = delete;
+  ScopedDisabler(ScopedDisabler &&) = delete;
+  ScopedDisabler &operator=(ScopedDisabler &&) = delete;
+#else
+private:
+  ScopedDisabler(const ScopedDisabler &);
+  ScopedDisabler &operator=(const ScopedDisabler &);
+#endif // __cplusplus >= 201103L
 };
 
 #endif // defined(__has_feature) && __has_feature(realtime_sanitizer)

compiler-rt/test/rtsan/disabler.cpp

@@ -14,21 +14,22 @@ void violation() [[clang::nonblocking]] {
   {
     __rtsan::ScopedDisabler disabler{};
     ptr = malloc(2);
-    printf("ptr: %p\n", ptr); // ensure we don't optimize out the malloc
+    fprintf(stderr, "Allocated pointer %p in disabled context\n", ptr);
   }
 
   // ensure nested disablers don't interfere with one another
-  void *ptr2;
   {
+    void *ptr2;
     __rtsan::ScopedDisabler disabler{};
     {
       __rtsan::ScopedDisabler disabler2{};
       ptr2 = malloc(2);
-      printf("ptr: %p\n", ptr); // ensure we don't optimize out the malloc
+      fprintf(stderr, "Allocated second pointer %p in disabled context\n",
+              ptr2);
     }
 
     free(ptr2);
-    printf("Free'd second pointer in disabled context without crashing\n");
+    fprintf(stderr, "Free'd second pointer in disabled context\n");
   }
 
   free(ptr);
@@ -37,10 +38,12 @@ void violation() [[clang::nonblocking]] {
 int main() {
   violation();
   return 0;
+  // CHECK: Allocated pointer {{.*}} in disabled context
+  // CHECK: Allocated second pointer {{.*}} in disabled context
+  // CHECK: Free'd second pointer in disabled context
   // CHECK: {{.*Real-time violation.*}}
   // CHECK-NOT: {{.*malloc*}}
-  // CHECK: Free'd second pointer in disabled context without crashing
-  // CHECK: {{.*real-time unsafe function `free`.*}}
+  // CHECK-NEXT: {{.*free.*}}
 }
 
 // CHECK-ENABLED-IR: {{.*@__rtsan_disable.*}}