[Comgr] Fix implicit cast from integer to single element ArrayRef<uint8_t> (llvm#1661)

Author: jmmartinez

amd/comgr/src/comgr-cache-command.cpp

@@ -67,12 +67,19 @@ std::optional<size_t> CachedCommandAdaptor::searchComgrTmpModel(StringRef S) {
   return Pos;
 }
 
+void CachedCommandAdaptor::addUInt(CachedCommandAdaptor::HashAlgorithm &H,
+                                   uint64_t I) {
+  uint8_t Bytes[sizeof(I)];
+  memcpy(&Bytes, &I, sizeof(I));
+  H.update(Bytes);
+}
+
 void CachedCommandAdaptor::addString(CachedCommandAdaptor::HashAlgorithm &H,
                                      StringRef S) {
   // hash size + contents to avoid collisions
   // for example, we have to ensure that the result of hashing "AA" "BB" is
   // different from "A" "ABB"
-  H.update(S.size());
+  addUInt(H, S.size());
   H.update(S);
 }
 

amd/comgr/src/comgr-cache-command.h

@@ -39,6 +39,7 @@ class CachedCommandAdaptor {
 
   // helper to work around the comgr-xxxxx string appearing in files
   static void addFileContents(HashAlgorithm &H, llvm::StringRef Buf);
+  static void addUInt(HashAlgorithm &H, uint64_t I);
   static void addString(HashAlgorithm &H, llvm::StringRef S);
   static std::optional<size_t> searchComgrTmpModel(llvm::StringRef S);
 

amd/comgr/src/comgr-unbundle-command.cpp

@@ -122,7 +122,7 @@ CachedCommandAdaptor::ActionClass UnbundleCommand::getClass() const {
 }
 
 void UnbundleCommand::addOptionsIdentifier(HashAlgorithm &H) const {
-  H.update(Config.TargetNames.size());
+  addUInt(H, Config.TargetNames.size());
   for (StringRef Target : Config.TargetNames) {
     CachedCommandAdaptor::addString(H, Target);
   }
@@ -150,8 +150,8 @@ Error UnbundleCommand::addInputIdentifier(HashAlgorithm &H) const {
   // contents should give the same result, regardless of the compression
   // algorithm or header version. Since the hash used by the offload bundler is
   // not a cryptographic hash, we also add the uncompressed file size.
-  H.update(MaybeHeader->Hash);
-  H.update(MaybeHeader->UncompressedFileSize);
+  addUInt(H, MaybeHeader->Hash);
+  addUInt(H, MaybeHeader->UncompressedFileSize);
   return Error::success();
 }