[compiler-rt] r202016 - Revert r202014.

[Evgeniy Stepanov]

Author: eugenis
Date: Mon Feb 24 04:21:44 2014
New Revision: 202016

URL: http://llvm.org/viewvc/llvm-project?rev=202016&view=rev
Log:
Revert r202014.

Failing on the bots for an unknown reason.

Modified:
    compiler-rt/trunk/test/asan/TestCases/SharedLibs/shared-lib-test-so.cc
    compiler-rt/trunk/test/asan/TestCases/asan-symbolize-sanity-test.cc
    compiler-rt/trunk/test/asan/TestCases/interception-in-shared-lib-test.cc

Modified: compiler-rt/trunk/test/asan/TestCases/SharedLibs/shared-lib-test-so.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/SharedLibs/shared-lib-test-so.cc?rev=202016&r1=202015&r2=202016&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/SharedLibs/shared-lib-test-so.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/SharedLibs/shared-lib-test-so.cc Mon Feb 24 04:21:44 2014
@@ -11,7 +11,6 @@
 //
 //===----------------------------------------------------------------------===//
 #include <stdio.h>
-#include <string.h>
 
 int pad[10];
 int GLOB[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
@@ -25,8 +24,3 @@ extern "C"
 void inc2(int *a, int index) {
   a[index]++;
 }
-
-extern "C"
-void my_memset(void *p, size_t sz) {
-  memset(p, 0, sz);
-}

Modified: compiler-rt/trunk/test/asan/TestCases/asan-symbolize-sanity-test.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/asan-symbolize-sanity-test.cc?rev=202016&r1=202015&r2=202016&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/asan-symbolize-sanity-test.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/asan-symbolize-sanity-test.cc Mon Feb 24 04:21:44 2014
@@ -30,7 +30,7 @@ int main(int argc, char *argv[]) {
   inc2(array, -1);  // BOOM
   // CHECK: ERROR: AddressSanitizer: heap-buffer-overflow
   // CHECK: READ of size 4 at 0x{{.*}}
-  // CHECK: #0 {{.*}} in inc2 {{.*}}shared-lib-test-so.cc:26
+  // CHECK: #0 {{.*}} in inc2 {{.*}}shared-lib-test-so.cc:25
   // CHECK: #1 {{.*}} in main {{.*}}asan-symbolize-sanity-test.cc:[[@LINE-4]]
   // CHECK: allocated by thread T{{.*}} here:
   // CHECK: #{{.*}} in {{(wrap_|__interceptor_)?}}malloc

Modified: compiler-rt/trunk/test/asan/TestCases/interception-in-shared-lib-test.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/interception-in-shared-lib-test.cc?rev=202016&r1=202015&r2=202016&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/interception-in-shared-lib-test.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/interception-in-shared-lib-test.cc Mon Feb 24 04:21:44 2014
@@ -1,36 +0,0 @@
-// Check that memset() call from a shared library gets intercepted.
-
-// RUN: %clangxx_asan -O0 %p/SharedLibs/shared-lib-test-so.cc \
-// RUN:     -shared -o %T/libinterception-in-shared-lib-test.so \
-// RUN:     -fPIC -Wl,--soname,libinterception-in-shared-lib-test.so
-// RUN: %clangxx_asan -O0 %s -o %t -Wl,-R,\$ORIGIN -L%T -linterception-in-shared-lib-test && \
-// RUN:     not %t 2>&1 | FileCheck %s
-
-#include <dlfcn.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <string>
-
-using std::string;
-
-typedef void (fun_t)(void *p, size_t sz);
-
-int main(int argc, char *argv[]) {
-  string path = string(argv[0]) + "-so.so";
-  printf("opening %s ... \n", path.c_str());
-  void *lib = dlopen(path.c_str(), RTLD_NOW);
-  if (!lib) {
-    printf("error in dlopen(): %s\n", dlerror());
-    return 1;
-  }
-  fun_t *my_memset = (fun_t*)dlsym(lib, "my_memset");
-  if (!my_memset) return 1;
-  printf("ok\n");
-  char buf[10];
-  my_memset(buf, 11);
-  // CHECK: {{.*ERROR: AddressSanitizer: stack-buffer-overflow}}
-  // CHECK: {{WRITE of size 11 at 0x.* thread T0}}
-  // CHECK: {{    #0 0x.* in my_memset .*shared-lib-test-so.cc:31}}
-  return 0;
-}