vendor/lldb/lldb-trunk-r321426vendor/lldb/lldb-trunk-r321414

2 files changed, 12 insertions, 12 deletions

diff --git a/packages/Python/lldbsuite/test/expression_command/radar_9673664/TestExprHelpExamples.py b/packages/Python/lldbsuite/test/expression_command/radar_9673664/TestExprHelpExamples.py
index a6c0c050c4681..4fc2463b25a8b 100644
--- a/packages/Python/lldbsuite/test/expression_command/radar_9673664/TestExprHelpExamples.py
+++ b/packages/Python/lldbsuite/test/expression_command/radar_9673664/TestExprHelpExamples.py
@@ -42,7 +42,7 @@ class Radar9673644TestCase(TestBase):
 
         # rdar://problem/9673664 lldb expression evaluation problem
 
-        self.expect('expr char c[] = "foo"; c[0]',
+        self.expect('expr char str[] = "foo"; str[0]',
                     substrs=["'f'"])
         # runCmd: expr char c[] = "foo"; c[0]
         # output: (char) $0 = 'f'
diff --git a/packages/Python/lldbsuite/test/expression_command/top-level/test.cpp b/packages/Python/lldbsuite/test/expression_command/top-level/test.cpp
index ce2ea3bbb1318..5a978743596a2 100644
--- a/packages/Python/lldbsuite/test/expression_command/top-level/test.cpp
+++ b/packages/Python/lldbsuite/test/expression_command/top-level/test.cpp
@@ -42,11 +42,11 @@ public:
             int i;
         } s = { 15 };
     
-        int as[4] = { 2, 3, 4, 5 };
+        int numbers[4] = { 2, 3, 4, 5 };
     
-        for (signed char a : as)
+        for (signed char number: numbers)
         {
-            s.i -= a;
+            s.i -= number;
         }
     
         return s.i;
@@ -94,14 +94,14 @@ public:
 
 int doTest()
 {
-    int a = m.memberResult();
-    a += MyClass::staticResult();
-    a += m.externResult();
-    a += MyEnum::myEnumThree;
-    a += myEnumOne;
-    a += AnotherClass().complicatedFunction();
-    a += DiamondD(3).accessor();
-    return a;
+    int accumulator = m.memberResult();
+    accumulator += MyClass::staticResult();
+    accumulator += m.externResult();
+    accumulator += MyEnum::myEnumThree;
+    accumulator += myEnumOne;
+    accumulator += AnotherClass().complicatedFunction();
+    accumulator += DiamondD(3).accessor();
+    return accumulator;
 }
 
 // --