Revert "Add a test for __block variables + asan."

This reverts commit r300228.

It's causing failures on a bot because of missing compiler-rt:
http://green.lab.llvm.org/green/job/clang-stage2-cmake-RgSan_check

2 files changed, 7 insertions, 28 deletions

diff --git a/debuginfo-tests/asan.c b/debuginfo-tests/asan.c
index a0668aa3e95..44cfe5027a3 100644
--- a/debuginfo-tests/asan.c
+++ b/debuginfo-tests/asan.c
@@ -1,40 +1,23 @@
 // RUN: %clang %target_itanium_abi_host_triple -arch x86_64 %s -o %t.out -g -fsanitize=address
 // RUN: %test_debuginfo %s %t.out
 //
+// DEBUGGER: break 21
+// DEBUGGER: r
+// DEBUGGER: p s
+//
+// CHECK: a = ([0] = 0, [1] = 1, [2] = 2, [3] = 3, [4] = 4, [5] = 5, [6] = 6, [7] = 7)
 
 struct S {
   int a[8];
 };
 
-void b();
-
 int f(struct S s, unsigned i) {
-  // DEBUGGER: break 16
-  // DEBUGGER: r
-  // DEBUGGER: p s
-  // CHECK: a = ([0] = 0, [1] = 1, [2] = 2, [3] = 3, [4] = 4, [5] = 5, [6] = 6, [7] = 7)
   return s.a[i];
 }
 
 int main(int argc, const char **argv) {
   struct S s = {{0, 1, 2, 3, 4, 5, 6, 7}};
-  if (f(s, 4) == 4) {
-    // DEBUGGER: break 26
-    // DEBUGGER: c
-    // DEBUGGER: p s
-    // CHECK: a = ([0] = 0, [1] = 1, [2] = 2, [3] = 3, [4] = 4, [5] = 5, [6] = 6, [7] = 7)
-    b();
-  }
+  if (f(s, 4) == 4)
+    return f(s, 0);
   return 0;
 }
-
-void c() {}
-
-void b() {
-  // DEBUGGER: break 39
-  // DEBUGGER: c
-  // DEBUGGER: p x
-  // CHECK: 42
-  __block int x = 42;
-  c();
-}
diff --git a/debuginfo-tests/llgdb.py b/debuginfo-tests/llgdb.py
index 7d4fdd64fd1..ce8346259e2 100644
--- a/debuginfo-tests/llgdb.py
+++ b/debuginfo-tests/llgdb.py
@@ -139,10 +139,6 @@ NOTE: There are several reasons why this may happen:
             frame = thread.GetFrameAtIndex(0)
             print frame.EvaluateExpression(' '.join(cmd[1:]))
 
-        elif re.match('^n|(next)$', cmd[0]):
-            thread = process.GetThreadAtIndex(0)
-            thread.StepOver()
-
         elif re.match('^q|(quit)$', cmd[0]):
             sys.exit(0)