Merge commit '0ce70fee7847' from swift/release/5.9 into stable/20221013

Author: git apple-llvm automerger

lldb/test/API/lang/cpp/preferred_name/TestPreferredName.py

@@ -6,11 +6,11 @@
 import lldb
 import lldbsuite.test.lldbutil as lldbutil
 from lldbsuite.test.lldbtest import *
-from lldbsuite.test import decorators
-
+from lldbsuite.test.decorators import *
 
 class TestPreferredName(TestBase):
 
+    @skipIf(compiler="clang", compiler_version=['<', '16.0'])
     def test_frame_var(self):
         self.build()
         lldbutil.run_to_source_breakpoint(self, "return", lldb.SBFileSpec("main.cpp"))
@@ -26,6 +26,7 @@ def test_frame_var(self):
         self.expect("frame variable varChar", substrs=["Bar<char>"])
         self.expect("frame variable varFooInt", substrs=["Foo<BarInt>"])
 
+    @skipIf(compiler="clang", compiler_version=['<', '16.0'])
     def test_expr(self):
         self.build()
         lldbutil.run_to_source_breakpoint(self, "return", lldb.SBFileSpec("main.cpp"))