From ce2f8b94cf9c944a489e94fcc5e7b8da2c44971e Mon Sep 17 00:00:00 2001 From: Ryan Kurtz Date: Mon, 23 Sep 2024 11:53:22 -0400 Subject: [PATCH] GP-4898: Fixes for the SwiftDemangler --- .../app/util/demangler/swift/SwiftDemangler.java | 9 --------- .../app/util/demangler/swift/SwiftDemanglerTest.java | 10 ++++++++-- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/Ghidra/Features/SwiftDemangler/src/main/java/ghidra/app/util/demangler/swift/SwiftDemangler.java b/Ghidra/Features/SwiftDemangler/src/main/java/ghidra/app/util/demangler/swift/SwiftDemangler.java index a36d05a8f7..c53a237539 100644 --- a/Ghidra/Features/SwiftDemangler/src/main/java/ghidra/app/util/demangler/swift/SwiftDemangler.java +++ b/Ghidra/Features/SwiftDemangler/src/main/java/ghidra/app/util/demangler/swift/SwiftDemangler.java @@ -106,15 +106,6 @@ public class SwiftDemangler implements Demangler { return null; } - @Override - public DemangledObject demangle(MangledContext context) throws DemangledException { - DemanglerOptions op = context.getOptions(); - String mangled = context.getMangled(); - DemangledObject demangledObject = demangle(mangled, op); - demangledObject.setMangledContext(context); - return demangledObject; - } - /** * Get a new {@link Demangled} by demangling the given mangled string * diff --git a/Ghidra/Features/SwiftDemangler/src/test/java/ghidra/app/util/demangler/swift/SwiftDemanglerTest.java b/Ghidra/Features/SwiftDemangler/src/test/java/ghidra/app/util/demangler/swift/SwiftDemanglerTest.java index fc4744e5a8..6971dd9e20 100644 --- a/Ghidra/Features/SwiftDemangler/src/test/java/ghidra/app/util/demangler/swift/SwiftDemanglerTest.java +++ b/Ghidra/Features/SwiftDemangler/src/test/java/ghidra/app/util/demangler/swift/SwiftDemanglerTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -702,4 +702,10 @@ public class SwiftDemanglerTest extends AbstractGenericTest { } assertEquals(demangled, function.toString()); } + + @Test + public void testUnsupportedString() throws Exception { + String mangled = "__mh_execute_header"; + assertNull(demangler.demangle(mangled)); + } }