Merge commit '13a8e5d9406f' from swift/release/5.3 into swift/master

Conflicts:
	lldb/source/Expression/Materializer.cpp

Author: adrian-prantl

lldb/test/API/lang/swift/expression/protocol_extension_self/Makefile

@@ -0,0 +1,3 @@
+SWIFT_SOURCES := main.swift
+
+include Makefile.rules

lldb/test/API/lang/swift/expression/protocol_extension_self/TestSwiftProtocolExtensionSelf.py

@@ -0,0 +1,18 @@
+
+from lldbsuite.test.lldbtest import *
+from lldbsuite.test.decorators import *
+
+
+class TestSwiftProtocolExtensionSelf(TestBase):
+
+    mydir = TestBase.compute_mydir(__file__)
+
+    @swiftTest
+    def test(self):
+        """Test that the generic self in a protocol extension works in the expression evaluator.
+        """
+        self.build()
+
+        lldbutil.run_to_source_breakpoint(self, "break here",
+                                          lldb.SBFileSpec('main.swift'))
+        self.expect("e f", substrs=[' = 12345'])

lldb/test/API/lang/swift/expression/protocol_extension_self/main.swift

@@ -0,0 +1,13 @@
+class C : CP {
+  let f: Int = 12345
+}
+
+protocol CP : class {}
+
+extension CP {
+  func foo() {
+    print(self)  // break here
+  }
+}
+
+C().foo()