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

This reapplies commit r300228.

2 files changed, 27 insertions, 9 deletions

diff --git a/debuginfo-tests/asan.c b/debuginfo-tests/asan.c
index 71838cde295..1407e01ed6b 100644
--- a/debuginfo-tests/asan.c
+++ b/debuginfo-tests/asan.c
@@ -3,24 +3,38 @@
 // REQUIRES: not_asan
 //           Zorg configures the ASAN stage2 bots to not build the asan
 //           compiler-rt. Only run this test on non-asanified configurations.
-//
-// DEBUGGER: break 24
-// DEBUGGER: r
-// DEBUGGER: p s
-//
-// CHECK: a = ([0] = 0, [1] = 1, [2] = 2, [3] = 3, [4] = 4, [5] = 5, [6] = 6, [7] = 7)
-
+void b();
 struct S {
   int a[8];
 };
 
 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)
-    return f(s, 0);
+  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();
+  }
   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 ce8346259e2..7d4fdd64fd1 100644
--- a/debuginfo-tests/llgdb.py
+++ b/debuginfo-tests/llgdb.py
@@ -139,6 +139,10 @@ 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)