3 files changed, 99 insertions, 0 deletions
diff --git a/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/Makefile b/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/Makefile
new file mode 100644
index 0000000000000..8a7102e347af2
--- /dev/null
+++ b/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/Makefile
@@ -0,0 +1,5 @@
+LEVEL = ../../make
+
+CXX_SOURCES := main.cpp
+
+include $(LEVEL)/Makefile.rules
diff --git a/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py b/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py
new file mode 100644
index 0000000000000..5c53cfaf9120e
--- /dev/null
+++ b/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py
@@ -0,0 +1,43 @@
+"""Test evaluating expressions which ref. index variable 'i' which just goes
+from out of scope to in scope when stopped at the breakpoint."""
+
+from __future__ import print_function
+
+
+
+import lldb
+from lldbsuite.test.lldbtest import *
+import lldbsuite.test.lldbutil as lldbutil
+
+class NonOverlappingIndexVariableCase(TestBase):
+
+    mydir = TestBase.compute_mydir(__file__)
+
+    def setUp(self):
+        TestBase.setUp(self)
+        self.source = 'main.cpp'
+        self.line_to_break = line_number(self.source, '// Set breakpoint here.')
+
+    # rdar://problem/9890530
+    def test_eval_index_variable(self):
+        """Test expressions of variable 'i' which appears in two for loops."""
+        self.build()
+        self.exe_name = 'a.out'
+        exe = os.path.join(os.getcwd(), self.exe_name)
+        self.runCmd("file %s" % exe, CURRENT_EXECUTABLE_SET)
+
+        lldbutil.run_break_set_by_file_and_line (self, self.source, self.line_to_break, num_expected_locations=1, loc_exact=True)
+
+        self.runCmd("run", RUN_SUCCEEDED)
+
+        # The stop reason of the thread should be breakpoint.
+        self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
+            substrs = ['stopped',
+                       'stop reason = breakpoint'])
+
+        self.runCmd('frame variable i')
+        self.runCmd('expr i')
+        self.runCmd('expr ptr[0]->point.x')
+        self.runCmd('expr ptr[0]->point.y')
+        self.runCmd('expr ptr[i]->point.x')
+        self.runCmd('expr ptr[i]->point.y')
diff --git a/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/main.cpp b/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/main.cpp
new file mode 100644
index 0000000000000..b4f519cd25a87
--- /dev/null
+++ b/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/main.cpp
@@ -0,0 +1,51 @@
+//===-- main.cpp ------------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+#include <stdio.h>
+
+class Point {
+public:
+    int x;
+    int y;
+    Point(int a, int b):
+        x(a),
+        y(b)
+    {}
+};
+
+class Data {
+public:
+    int id;
+    Point point;
+    Data(int i):
+        id(i),
+        point(0, 0)
+    {}
+};
+
+int main(int argc, char const *argv[]) {
+    Data *data[1000];
+    Data **ptr = data;
+    for (int i = 0; i < 1000; ++i) {
+        ptr[i] = new Data(i);
+        ptr[i]->point.x = i;
+        ptr[i]->point.y = i+1;
+    }
+
+    printf("Finished populating data.\n");
+    for (int i = 0; i < 1000; ++i) {
+        bool dump = argc > 1; // Set breakpoint here.
+                              // Evaluate a couple of expressions (2*1000 = 2000 exprs):
+                              // expr ptr[i]->point.x
+                              // expr ptr[i]->point.y
+        if (dump) {
+            printf("data[%d] = %d (%d, %d)\n", i, ptr[i]->id, ptr[i]->point.x, ptr[i]->point.y);
+        }
+    }
+    return 0;
+}