From 0945c7e4e6b52126886ef81d8f217690f0dbe7e6 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Thu, 9 Sep 2021 16:21:02 -0400
Subject: [PATCH] demangle/GCC3+: Improve/fix behavior of ClonedNode.

Most of the ClonedNode methods just forward calls as appropriate to
fNode or fClonedNode, but missed that fNode is itself always an ObjectNode.
Now we store that, and forward on the two relevant ObjectNode calls.

This fixes kernel stack trace function demangling where the symbols
contained clones (e.g. "[clone .localalias]", etc.). Before this commit,
such symbols would just appear as "()" and no more.

The "[clone...]" block will in such cases appear after the function name
and not after all the function parameters, as the two are returned
separately and there is no way to indicate how they should be printed
in the kernel's API usage of these functions.

ClonedNode was only introduced a few months ago in hrev55147,
so this has not been broken for too long.
---
 .../kernel/debugger/demangle/gcc3+.cpp        | 42 +++++++++++++++----
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/src/add-ons/kernel/debugger/demangle/gcc3+.cpp b/src/add-ons/kernel/debugger/demangle/gcc3+.cpp
index 65b02fab4a..f490f2275a 100644
--- a/src/add-ons/kernel/debugger/demangle/gcc3+.cpp
+++ b/src/add-ons/kernel/debugger/demangle/gcc3+.cpp
@@ -1300,7 +1300,7 @@ private:
 
 class ClonedNode : public ObjectNode {
 public:
-	ClonedNode(Node* clone, Node* node)
+	ClonedNode(Node* clone, ObjectNode* node)
 		:
 		ObjectNode(NULL),
 		fNode(node),
@@ -1314,12 +1314,22 @@ public:
 	{
 		if (!fNode->GetName(buffer))
 			return false;
+		buffer.Append(" ", 1);
+		return _AppendCloneName(buffer);
+	}
 
-		buffer.Append(" [clone ");
-		if (!fCloneNode->GetName(buffer))
-			return false;
-		buffer.Append("]");
-		return true;
+	virtual bool GetObjectName(NameBuffer& buffer,
+		const DemanglingParameters& parameters)
+	{
+		if (parameters.objectNameOnly) {
+			if (!fNode->GetObjectName(buffer, parameters))
+				return false;
+			if (!_AppendCloneName(buffer))
+				return false;
+			return buffer.Append(" ", 1);
+		}
+
+		return ObjectNode::GetObjectName(buffer, parameters);
 	}
 
 	virtual Node* GetUnqualifiedNode(Node* beforeNode)
@@ -1344,9 +1354,24 @@ public:
 		return PREFIX_UNKNOWN;
 	}
 
+	virtual Node* ParameterAt(uint32 index) const
+	{
+		return fNode->ParameterAt(index);
+	}
+
 private:
-	Node*	fNode;
-	Node*	fCloneNode;
+	bool _AppendCloneName(NameBuffer& buffer) const
+	{
+		buffer.Append("[clone ");
+		if (!fCloneNode->GetName(buffer))
+			return false;
+		buffer.Append("]");
+		return true;
+	}
+
+private:
+	ObjectNode*	fNode;
+	Node*		fCloneNode;
 };
 
 
@@ -3969,7 +3994,6 @@ get_next_argument_gcc3(uint32* _cookie, const char* mangledName, char* name,
 const char*
 demangle_name_gcc3(const char* mangledName, char* buffer, size_t bufferSize)
 {
-
 	Demangler demangler;
 	DemanglingInfo info(false);
 	if (demangler.Demangle(mangledName, buffer, bufferSize, info) != ERROR_OK)