Merge remote-tracking branch 'origin/GP-0_Dan_testFixes-2024-08-28-1'

Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/guest/DBTraceGuestPlatform.java

@@ -230,11 +230,6 @@ public class DBTraceGuestPlatform extends DBAnnotatedObject
 		return languageEntry == null ? manager.baseLanguage : languageEntry.getLanguage();
 	}
 
-	@Override
-	public AddressFactory getAddressFactory() {
-		return manager.trace.getBaseAddressFactory();
-	}
-
 	@Override
 	public CompilerSpec getCompilerSpec() {
 		return compilerSpec;

Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/guest/DBTracePlatformManager.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.
@@ -92,6 +92,11 @@ public class DBTracePlatformManager implements DBTraceManager, TracePlatformMana
 			return trace.getBaseCompilerSpec();
 		}
 
+		@Override
+		public AddressFactory getAddressFactory() {
+			return trace.getBaseAddressFactory();
+		}
+
 		@Override
 		public AddressSetView getHostAddressSet() {
 			return trace.getBaseAddressFactory().getAddressSet();