Merge remote-tracking branch 'llvm/master' into upstream-with-swift

apple-llvm-split-commit: 2d7a1579e1d4b0a7771b521d514706d4de445913
apple-llvm-split-dir: lldb/

Author: swift-ci

lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/deque-dbg-info-content/TestDbgInfoContentDeque.py

@@ -25,12 +25,12 @@ def test(self):
         self.runCmd("settings set target.import-std-module true")
 
         self.expect("expr (size_t)a.size()", substrs=['(size_t) $0 = 3'])
-        self.expect("expr (int)a.front()->a", substrs=['(int) $1 = 3'])
-        self.expect("expr (int)a.back()->a", substrs=['(int) $2 = 2'])
+        self.expect("expr (int)a.front().a", substrs=['(int) $1 = 3'])
+        self.expect("expr (int)a.back().a", substrs=['(int) $2 = 2'])
 
         self.expect("expr std::reverse(a.begin(), a.end())")
-        self.expect("expr (int)a.front()->a", substrs=['(int) $3 = 2'])
-        self.expect("expr (int)a.back()->a", substrs=['(int) $4 = 3'])
+        self.expect("expr (int)a.front().a", substrs=['(int) $3 = 2'])
+        self.expect("expr (int)a.back().a", substrs=['(int) $4 = 3'])
 
         self.expect("expr (int)(a.begin()->a)", substrs=['(int) $5 = 2'])
         self.expect("expr (int)(a.rbegin()->a)", substrs=['(int) $6 = 3'])

lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/forward_list-dbg-info-content/TestDbgInfoContentForwardList.py

@@ -25,7 +25,7 @@ def test(self):
         self.runCmd("settings set target.import-std-module true")
 
         self.expect("expr (size_t)std::distance(a.begin(), a.end())", substrs=['(size_t) $0 = 3'])
-        self.expect("expr (int)a.front()->a", substrs=['(int) $1 = 3'])
+        self.expect("expr (int)a.front().a", substrs=['(int) $1 = 3'])
 
         self.expect("expr (int)(a.begin()->a)", substrs=['(int) $2 = 3'])