Fix some issues with the gdb pretty printers for llvm::Twine

Still some pending bugs, but at least ironed some things out.

2 files changed, 7 insertions, 2 deletions

diff --git a/cross-project-tests/debuginfo-tests/llvm-prettyprinters/gdb/llvm-support.cpp b/cross-project-tests/debuginfo-tests/llvm-prettyprinters/gdb/llvm-support.cpp
index 867962876916..61ef52e079b8 100644
--- a/cross-project-tests/debuginfo-tests/llvm-prettyprinters/gdb/llvm-support.cpp
+++ b/cross-project-tests/debuginfo-tests/llvm-prettyprinters/gdb/llvm-support.cpp
@@ -24,7 +24,12 @@ llvm::Optional<int> OptionalNone(llvm::None);
 llvm::SmallVector<int, 5> SmallVector = {10, 11, 12};
 llvm::SmallString<5> SmallString("foo");
 llvm::StringRef StringRef = "bar";
-llvm::Twine Twine = llvm::Twine(SmallString) + StringRef;
+// Should test std::string in Twine too, but it's currently broken because I
+// don't know how to add 'str' and 'gdb.LazyString' (can't figure out any way to
+// string-ify LazyString).
+//std::string String = "foo";
+llvm::Twine TempTwine = llvm::Twine(3) + StringRef;
+llvm::Twine Twine = TempTwine + "baz";
 llvm::PointerIntPair<int *, 1> PointerIntPair(IntPtr, 1);
 
 struct alignas(8) Z {};
diff --git a/cross-project-tests/debuginfo-tests/llvm-prettyprinters/gdb/llvm-support.gdb b/cross-project-tests/debuginfo-tests/llvm-prettyprinters/gdb/llvm-support.gdb
index c6b334ffa9a8..b5f625d4702b 100644
--- a/cross-project-tests/debuginfo-tests/llvm-prettyprinters/gdb/llvm-support.gdb
+++ b/cross-project-tests/debuginfo-tests/llvm-prettyprinters/gdb/llvm-support.gdb
@@ -37,7 +37,7 @@ p SmallString
 # CHECK: "bar"
 p StringRef
 
-# CHECK: "foobar"
+# CHECK: "3barbaz"
 p Twine
 
 # CHECK: llvm::StringMap with 2 elements = {["foo"] = 123, ["bar"] = 456}