Address comments.

Author: kazutakahirata

llvm/lib/Transforms/Instrumentation/MemProfiler.cpp

@@ -818,9 +818,9 @@ static bool isAllocationWithHotColdVariant(const Function *Callee,
 
 struct AllocMatchInfo {
   uint64_t TotalSize = 0;
+  size_t NumFramesMatched = 0;
   AllocationType AllocType = AllocationType::None;
   bool Matched = false;
-  size_t NumFramesMatched = 0;
 };
 
 DenseMap<uint64_t, SmallVector<CallEdgeTy, 0>>
@@ -1153,8 +1153,8 @@ readMemprof(Module &M, Function &F, IndexedInstrProfReader *MemProfReader,
             if (ClPrintMemProfMatchInfo) {
               assert(FullStackId != 0);
               FullStackIdToAllocMatchInfo[FullStackId] = {
-                  AllocInfo->Info.getTotalSize(), AllocType, /*Matched=*/true,
-                  InlinedCallStack.size()};
+                  AllocInfo->Info.getTotalSize(), InlinedCallStack.size(),
+                  AllocType, /*Matched=*/true};
             }
           }
         }

llvm/test/Transforms/PGOProfile/memprof-dump-matched-alloc-site.ll

@@ -30,7 +30,6 @@
 
 ;--- memprof-dump-matched-alloc-site.yaml
 ---
----
 HeapProfileRecords:
   - GUID:            _Z2f3v
     AllocSites:
@@ -45,6 +44,7 @@ HeapProfileRecords:
           TotalLifetime:   0
           TotalLifetimeAccessDensity: 0
     CallSites:
+      # Kept empty here because this section is irrelevant for this test.
 ...
 ;--- memprof-dump-matched-alloc-site.ll
 ; CHECK: MemProf notcold context with id 12978026349401156968 has total profiled size 3 is matched with 3 frames