Scope id fix for external references

Author: caheckman

Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/DecompileCallback.java

@@ -757,8 +757,17 @@ public String getExternalRefXML(String addrstring) { // Return any external refe
 				if (extRef != null) {
 					func = listing.getFunctionAt(extRef.getToAddress());
 					if (func == null) {
+						Symbol symbol = extRef.getExternalLocation().getSymbol();
+						long extId;
+						if (symbol != null) {
+							extId = symbol.getID();
+						}
+						else {
+							extId = program.getSymbolTable().getDynamicSymbolID(addr);
+
+						}
 						HighSymbol shellSymbol =
-							new HighFunctionShellSymbol(0, extRef.getLabel(), addr, dtmanage);
+							new HighFunctionShellSymbol(extId, extRef.getLabel(), addr, dtmanage);
 						return buildResult(shellSymbol, null);
 					}
 				}

Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/HighFunctionShellSymbol.java

@@ -55,6 +55,7 @@ public boolean isGlobal() {
 	@Override
 	public void saveXML(StringBuilder buf) {
 		buf.append("<function");
+		SpecXmlUtils.encodeUnsignedIntegerAttribute(buf, "id", getId());
 		SpecXmlUtils.xmlEscapeAttribute(buf, "name", name);
 		SpecXmlUtils.encodeSignedIntegerAttribute(buf, "size", 1);
 		buf.append(">\n");