Merge remote-tracking branch

'origin/GP-7092_dragonmache3r_PR-9387_brothersw_master' (Closes #9386,
Closes #9387)

Ghidra/Features/Base/src/test/java/ghidra/app/cmd/function/DeleteFunctionCmdTest.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.
@@ -39,8 +39,7 @@ public class DeleteFunctionCmdTest extends AbstractGenericTest {
 	private Program program;
 
 	/**
-	 * Constructs this test class with the given test method name.
-	 * 
+	 * Constructs this test class with the given test method name
 	 */
 	public DeleteFunctionCmdTest() {
 		super();
@@ -56,7 +55,7 @@ public class DeleteFunctionCmdTest extends AbstractGenericTest {
 	}
 
 	/**
-	 * Tests the deleting of functions via the {@link DeleteFunctionCmd}.
+	 * Tests the deleting of functions via the {@link DeleteFunctionCmd}
 	 */
 	@Test
 	public void testDeleteFunction() {
@@ -115,11 +114,38 @@ public class DeleteFunctionCmdTest extends AbstractGenericTest {
 		program.endTransaction(transactionID, false);
 	}
 
+	/**
+	 * This is a regression test. Make sure function deletes work with multiple tags.
+	 */
+	@Test
+	public void testDeleteFunctionWithMultipleTags() {
+
+		Address address = addr(0x0);
+		String defaultName = SymbolUtilities.getDefaultFunctionName(address);
+
+		int transactionID = program.startTransaction("TEST");
+
+		Function function =
+			createFunction(defaultName, address, new AddressSet(address, address.add(200L)));
+		assertNotNull("The test function was not created as expected.", function);
+
+		function.addTag("tag1");
+		function.addTag("tag2");
+		function.addTag("tag3");
+
+		DeleteFunctionCmd deleteFunctionCmd = new DeleteFunctionCmd(address);
+		deleteFunctionCmd.applyTo(program);
+
+		function = program.getListing().getFunctionAt(address);
+		assertNull("The function was not deleted as expected.", function);
+
+		program.endTransaction(transactionID, false);
+	}
+
 	// looks through the given symbol array to see if any have the same name 
 	// as the provided string
 	private boolean containsMatchingSymbolName(Symbol[] symbols, String name) {
 		for (Symbol symbol : symbols) {
-			System.err.println("checking: " + symbol + " against " + name);
 			if (symbol.getName().equals(name)) {
 				return true;
 			}

Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/function/FunctionDB.java

@@ -1528,21 +1528,21 @@ public class FunctionDB extends DbObject implements Function {
 		// cache will have the current tag state unless tags have been deleted or edited; in
 		// those cases the validity check will fail and we'll be forced to go back to
 		// the db.
+		Set<FunctionTag> copy = new HashSet<>();
 		try (Closeable c = lock.read()) {
 
-			if (refreshIfNeeded() && tags != null) {
-				return tags;
+			if (!refreshIfNeeded() || tags == null) {
+				FunctionTagManagerDB tagManager =
+					(FunctionTagManagerDB) manager.getFunctionTagManager();
+				tags = tagManager.getFunctionTagsByFunctionID(getID());
 			}
 
-			// Get a list of all tag records that map to our function.
-			FunctionTagManagerDB tagManager =
-				(FunctionTagManagerDB) manager.getFunctionTagManager();
-			tags = tagManager.getFunctionTagsByFunctionID(getID());
+			copy.addAll(tags);
 		}
 		catch (IOException e) {
 			manager.dbError(e);
 		}
-		return tags;
+		return copy;
 
 	}
 

Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/Function.java

@@ -283,7 +283,7 @@ public interface Function extends Namespace {
 	/**
 	 * Return all {@link FunctionTag} objects associated with this function.
 	 * 
-	 * @return set of tag names
+	 * @return set of tags
 	 */
 	public Set<FunctionTag> getTags();