[compiler-rt] r175655 - [ASan] revert part of r175631 that looks like accidental commit

[Alexey Samsonov]

Author: samsonov
Date: Wed Feb 20 13:55:47 2013
New Revision: 175655

URL: http://llvm.org/viewvc/llvm-project?rev=175655&view=rev
Log:
[ASan] revert part of r175631 that looks like accidental commit

Modified:
    compiler-rt/trunk/lib/asan/tests/asan_test.cc

Modified: compiler-rt/trunk/lib/asan/tests/asan_test.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/tests/asan_test.cc?rev=175655&r1=175654&r2=175655&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/tests/asan_test.cc (original)
+++ compiler-rt/trunk/lib/asan/tests/asan_test.cc Wed Feb 20 13:55:47 2013
@@ -1133,15 +1133,11 @@ TEST(AddressSanitizer, AttributeNoAddres
 
 // It doesn't work on Android, as calls to new/delete go through malloc/free.
 #if !defined(ANDROID) && !defined(__ANDROID__)
-#if 0
 static string MismatchStr(const string &str) {
   return string("AddressSanitizer: alloc-dealloc-mismatch \\(") + str;
 }
-#endif
 
 TEST(AddressSanitizer, AllocDeallocMismatch) {
-  free(Ident(new int));
-#if 0
   EXPECT_DEATH(free(Ident(new int)),
                MismatchStr("operator new vs free"));
   EXPECT_DEATH(free(Ident(new int[2])),
@@ -1154,7 +1150,6 @@ TEST(AddressSanitizer, AllocDeallocMisma
                MismatchStr("operator new vs operator delete \\[\\]"));
   EXPECT_DEATH(delete [] (Ident((int*)malloc(2 * sizeof(int)))),
                MismatchStr("malloc vs operator delete \\[\\]"));
-#endif
 }
 #endif