[llvm] 2be94d1 - Revert "[MC] Make .pseudo_probe sections deterministic after D91878"

[Fangrui Song via llvm-commits]

Author: Fangrui Song
Date: 2023-09-20T16:36:23-07:00
New Revision: 2be94d18b502d89a4179272b202db4a4267e4501

URL: https://github.com/llvm/llvm-project/commit/2be94d18b502d89a4179272b202db4a4267e4501
DIFF: https://github.com/llvm/llvm-project/commit/2be94d18b502d89a4179272b202db4a4267e4501.diff

LOG: Revert "[MC] Make .pseudo_probe sections deterministic after D91878"

This reverts commit c8fd0cf713446ac1f3e9b677ec8500365a98c219.

Caused heap-use-after-free

Added: 
    

Modified: 
    llvm/include/llvm/MC/MCPseudoProbe.h

Removed: 
    


################################################################################
diff  --git a/llvm/include/llvm/MC/MCPseudoProbe.h b/llvm/include/llvm/MC/MCPseudoProbe.h
index fb8f4afefa939a3..4904cb4ca545676 100644
--- a/llvm/include/llvm/MC/MCPseudoProbe.h
+++ b/llvm/include/llvm/MC/MCPseudoProbe.h
@@ -55,7 +55,6 @@
 #define LLVM_MC_MCPSEUDOPROBE_H
 
 #include "llvm/ADT/DenseSet.h"
-#include "llvm/ADT/MapVector.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/IR/PseudoProbe.h"
@@ -300,7 +299,8 @@ class MCPseudoProbeSections {
     MCProbeDivisions[FuncSym].addPseudoProbe(Probe, InlineStack);
   }
 
-  using MCProbeDivisionMap = MapVector<MCSymbol *, MCPseudoProbeInlineTree>;
+  // TODO: Sort by getOrdinal to ensure a determinstic section order
+  using MCProbeDivisionMap = std::map<MCSymbol *, MCPseudoProbeInlineTree>;
 
 private:
   // A collection of MCPseudoProbe for each function. The MCPseudoProbes are