[llvm-commits] [compiler-rt] r163583 - /compiler-rt/trunk/lib/asan/asan_report.cc

[Chandler Carruth]

Author: chandlerc
Date: Mon Sep 10 20:13:51 2012
New Revision: 163583

URL: http://llvm.org/viewvc/llvm-project?rev=163583&view=rev
Log:
Revert r163411 based on review discussion.

In code review, it looked like these warnings do not actually fire with
modern Clang or GCC. However, the pragma is flat out rejected by GCC in
many configurations (-Werror) so it ended up causing more problems than
it fixed.

Daniel agreed with reverting this, but I think didn't have time to get
to it.

Modified:
    compiler-rt/trunk/lib/asan/asan_report.cc

Modified: compiler-rt/trunk/lib/asan/asan_report.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_report.cc?rev=163583&r1=163582&r2=163583&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_report.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_report.cc Mon Sep 10 20:13:51 2012
@@ -270,9 +270,6 @@
   }
 };
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Winvalid-noreturn"
-
 void ReportSIGSEGV(uptr pc, uptr sp, uptr bp, uptr addr) {
   ScopedInErrorReport in_report;
   Report("ERROR: AddressSanitizer crashed on unknown address %p"
@@ -329,8 +326,6 @@
   DescribeAddress((uptr)offset2, length2);
 }
 
-#pragma clang diagnostic pop
-
 // ----------------------- Mac-specific reports ----------------- {{{1
 
 void WarnMacFreeUnallocated(
@@ -344,9 +339,6 @@
   DescribeHeapAddress(addr, 1);
 }
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Winvalid-noreturn"
-
 void ReportMacMzReallocUnknown(
     uptr addr, uptr zone_ptr, const char *zone_name, StackTrace *stack) {
   ScopedInErrorReport in_report;
@@ -369,8 +361,6 @@
   DescribeHeapAddress(addr, 1);
 }
 
-#pragma clang diagnostic pop
-
 }  // namespace __asan
 
 // --------------------------- Interface --------------------- {{{1