[lldb] Fix expression evaluation in static functions in actors

Instead of trying to discern if lldb is stopped in a static or class
function, always generate the function as static in either of those
cases, since static works for classes/actors/structs/enums and for
expression evaluation purposes a static or class function will work
exactly the same.

rdar://152446035

Author: augusto2112

lldb/source/Plugins/ExpressionParser/Swift/SwiftExpressionSourceCode.cpp

@@ -430,9 +430,6 @@ do {
   if (needs_object_ptr || static_method) {
     const char *func_decorator = "";
     if (static_method) {
-      if (is_class)
-        func_decorator = "final class";
-      else
         func_decorator = "static";
     } else if (is_class && !weak_self) {
       func_decorator = "final";

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

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

lldb/test/API/lang/swift/expression/actor/TestSwiftExpressionActor.py

@@ -0,0 +1,39 @@
+# TestSwiftExpressionsInClassFunctions.py
+#
+# This source file is part of the Swift.org open source project
+#
+# Copyright (c) 2014 - 2016 Apple Inc. and the Swift project authors
+# Licensed under Apache License v2.0 with Runtime Library Exception
+#
+# See https://swift.org/LICENSE.txt for license information
+# See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+#
+# ------------------------------------------------------------------------------
+"""
+Test expressions in the context of class functions
+"""
+import lldb
+from lldbsuite.test.lldbtest import *
+from lldbsuite.test.decorators import *
+import lldbsuite.test.lldbutil as lldbutil
+import os
+
+
+class TestSwiftExpressionActor(TestBase):
+    @swiftTest
+    def test_static_func(self):
+        self.build()
+        lldbutil.run_to_source_breakpoint(
+            self, "break here for static", lldb.SBFileSpec("main.swift")
+        )
+
+        self.expect("expr self", substrs=["A.Type"])
+
+    @swiftTest
+    def test_func(self):
+        self.build()
+        lldbutil.run_to_source_breakpoint(
+            self, "break here for func", lldb.SBFileSpec("main.swift")
+        )
+
+        self.expect("expr self", substrs=["(a.A)", "i = 42", 's = "Hello"'])

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

@@ -0,0 +1,14 @@
+actor A {
+    let i = 42
+    let s = "Hello"
+    static func foo() {
+        print("break here for static")
+    }
+
+    func bar() {
+        print("break here for func")
+    }
+}
+
+A.foo()
+await A().bar()