Changes required for upstream merge

Change-Id: I4547d9226bf208ff6817193861b1ccdf2a9f6a77

Author: kzhuravl

amd/comgr/src/comgr-disassembly.cpp

@@ -144,7 +144,7 @@ amd_comgr_status_t DisassemblyInfo::disassembleInstruction(uint64_t Address,
 
   std::string InstStr;
   raw_string_ostream InstStream(InstStr);
-  IP->printInst(&Inst, InstStream, AnnotationsStream.str(), *STI);
+  IP->printInst(&Inst, Address, AnnotationsStream.str(), *STI, InstStream);
 
   PrintInstruction(InstStream.str().c_str(), UserData);
 

amd/comgr/src/comgr-objdump.cpp

@@ -560,7 +560,7 @@ class PrettyPrinter {
       dumpBytes(Bytes, OS);
     }
     if (MI)
-      IP.printInst(MI, OS, "", STI);
+      IP.printInst(MI, Address.Address, "", STI, OS);
     else
       OS << " <unknown>";
   }
@@ -593,7 +593,7 @@ class HexagonPrettyPrinter : public PrettyPrinter {
     std::string Buffer;
     {
       raw_string_ostream TempStream(Buffer);
-      IP.printInst(MI, TempStream, "", STI);
+      IP.printInst(MI, Address.Address, "", STI, TempStream);
     }
     StringRef Contents(Buffer);
     // Split off bundle attributes
@@ -645,7 +645,7 @@ class AMDGCNPrettyPrinter : public PrettyPrinter {
     SmallString<40> InstStr;
     raw_svector_ostream IS(InstStr);
 
-    IP.printInst(MI, IS, "", STI);
+    IP.printInst(MI, Address.Address, "", STI, IS);
 
     OS << left_justify(IS.str(), 60)
        << format("// %012" PRIX64 ": ", Address.Address);
@@ -677,7 +677,7 @@ class BPFPrettyPrinter : public PrettyPrinter {
       dumpBytes(Bytes, OS);
     }
     if (MI)
-      IP.printInst(MI, OS, "", STI);
+      IP.printInst(MI, Address.Address, "", STI, OS);
     else
       OS << " <unknown>";
   }