Update names

Author: kastiglione

lldb/include/lldb/Target/Target.h

@@ -215,7 +215,7 @@ class TargetProperties : public Properties {
 
   bool GetSwiftAutoImportFrameworks() const;
 
-  bool GetSwiftUseNewPrintObject() const;
+  bool GetSwiftUseContextFreePrintObject() const;
 
   bool GetEnableAutoImportClangModules() const;
 

lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.cpp

@@ -913,7 +913,7 @@ std::string SwiftLanguageRuntime::GetObjectDescriptionExpr_Copy(
 }
 
 static llvm::Expected<ValueObjectSP>
-runObjectDescription(ValueObject &object, std::string &expr_string,
+RunObjectDescription(ValueObject &object, std::string &expr_string,
                      Process &process, bool disable_availability = false) {
   Log *log(GetLog(LLDBLog::DataFormatters | LLDBLog::Expressions));
   ValueObjectSP result_sp;
@@ -958,18 +958,7 @@ runObjectDescription(ValueObject &object, std::string &expr_string,
   return result_sp;
 }
 
-static llvm::Error dumpString(ValueObjectSP result_sp, Stream &strm);
-
-llvm::Error SwiftLanguageRuntime::RunObjectDescriptionExpr(
-    ValueObject &object, std::string &expr_string, Stream &strm) {
-  auto result_or_err = runObjectDescription(object, expr_string, GetProcess());
-  if (!result_or_err)
-    return result_or_err.takeError();
-
-  return dumpString(*result_or_err, strm);
-}
-
-static llvm::Error dumpString(ValueObjectSP result_sp, Stream &strm) {
+static llvm::Error DumpString(ValueObjectSP result_sp, Stream &strm) {
   Log *log(GetLog(LLDBLog::DataFormatters | LLDBLog::Expressions));
   formatters::StringPrinter::ReadStringAndDumpToStreamOptions dump_options;
   dump_options.SetEscapeNonPrintables(false);
@@ -992,6 +981,15 @@ static llvm::Error dumpString(ValueObjectSP result_sp, Stream &strm) {
   return llvm::createStringError("expression produced unprintable string");
 }
 
+llvm::Error SwiftLanguageRuntime::RunObjectDescriptionExpr(
+    ValueObject &object, std::string &expr_string, Stream &strm) {
+  auto result_or_err = RunObjectDescription(object, expr_string, GetProcess());
+  if (!result_or_err)
+    return result_or_err.takeError();
+
+  return DumpString(*result_or_err, strm);
+}
+
 static bool IsVariable(ValueObject &object) {
   if (object.IsSynthetic())
     return IsVariable(*object.GetNonSyntheticValue());
@@ -1021,7 +1019,7 @@ static bool IsSwiftReferenceType(ValueObject &object) {
   return false;
 }
 
-static bool printObjectViaPointer(Stream &strm, ValueObject &object,
+static bool PrintObjectViaPointer(Stream &strm, ValueObject &object,
                                   Process &process) {
   Log *log = GetLog(LLDBLog::DataFormatters | LLDBLog::Expressions);
 
@@ -1055,7 +1053,7 @@ static bool printObjectViaPointer(Stream &strm, ValueObject &object,
           addr, mangled_type_name)
           .str();
 
-  auto result_or_err = runObjectDescription(object, expr_string, process, true);
+  auto result_or_err = RunObjectDescription(object, expr_string, process, true);
   if (!result_or_err) {
     LLDB_LOG_ERROR(log, result_or_err.takeError(),
                    "stringForPrintObject(_:mangledTypeName:) failed: {0}");
@@ -1068,7 +1066,7 @@ static bool printObjectViaPointer(Stream &strm, ValueObject &object,
   auto description_sp = result_sp->GetChildAtIndex(1);
 
   StreamString dump_stream;
-  auto err = dumpString(description_sp, dump_stream);
+  auto err = DumpString(description_sp, dump_stream);
   if (err) {
     LLDB_LOG_ERROR(log, std::move(err),
                    "decoding result of "
@@ -1094,8 +1092,8 @@ llvm::Error SwiftLanguageRuntime::GetObjectDescription(Stream &str,
   if (object.IsUninitializedReference())
     return llvm::createStringError("<uninitialized>");
 
-  if (GetProcess().GetTarget().GetSwiftUseNewPrintObject())
-    if (printObjectViaPointer(str, object, GetProcess()))
+  if (GetProcess().GetTarget().GetSwiftUseContextFreePrintObject())
+    if (PrintObjectViaPointer(str, object, GetProcess()))
       return llvm::Error::success();
 
   std::string expr_string;

lldb/source/Target/Target.cpp

@@ -4705,14 +4705,14 @@ bool TargetProperties::GetSwiftAutoImportFrameworks() const {
       idx, g_target_properties[idx].default_uint_value != 0);
 }
 
-bool TargetProperties::GetSwiftUseNewPrintObject() const {
+bool TargetProperties::GetSwiftUseContextFreePrintObject() const {
   const Property *exp_property =
       m_collection_sp->GetPropertyAtIndex(ePropertyExperimental);
   OptionValueProperties *exp_values =
       exp_property->GetValue()->GetAsProperties();
   if (exp_values)
     return exp_values
-        ->GetPropertyAtIndexAs<bool>(ePropertySwiftUseNewPrintObject)
+        ->GetPropertyAtIndexAs<bool>(ePropertySwiftUseContextFreePrintObject)
         .value_or(false);
   return false;
 }

lldb/source/Target/TargetProperties.td

@@ -37,9 +37,9 @@ let Definition = "target_experimental" in {
   def SwiftCacheTaskPointerLocation: Property<"swift-cache-task-pointer-location", "Boolean">,
     DefaultTrue,
     Desc<"Enables caching of task pointers inside the swift tasks plugin">;
-  def SwiftUseNewPrintObject: Property<"swift-use-new-po", "Boolean">,
+  def SwiftUseContextFreePrintObject: Property<"swift-use-context-free-po", "Boolean">,
     DefaultFalse,
-    Desc<"If true, use the new Swift po implementation.">;
+    Desc<"If true, use the context-free po implementation for Swift.">;
   def UseDIL : Property<"use-DIL", "Boolean">,
     Global, DefaultTrue,
     Desc<"If true, use the DIL implementation for frame variable evaluation.">;

lldb/test/API/lang/swift/expression/error_reporting/TestSwiftExpressionErrorReporting.py

@@ -68,7 +68,7 @@ def test_missing_type(self):
         target, process, thread, bkpt = lldbutil.run_to_source_breakpoint(
             self, 'break here', lldb.SBFileSpec('main.swift'))
 
-        self.runCmd("settings set target.experimental.swift-use-new-po true")
+        self.runCmd("settings set target.experimental.swift-use-context-free-po true")
 
         options = lldb.SBExpressionOptions()
         value = self.frame().EvaluateExpression("strct", options)

lldb/test/API/lang/swift/po/pointer_and_mangled_typename/TestSwiftPrintObjectPointerAndTypeName.py

@@ -9,7 +9,7 @@ class TestCase(TestBase):
     def setUp(self):
         TestBase.setUp(self)
         self.build()
-        self.runCmd("settings set target.experimental.swift-use-new-po true")
+        self.runCmd("settings set target.experimental.swift-use-context-free-po true")
 
         self.log = self.getBuildArtifact("expr.log")
         self.runCmd(f"log enable lldb expr -f {self.log}")