Skip to content

Commit 2be94d1

Browse files
committed
Revert "[MC] Make .pseudo_probe sections deterministic after D91878"
This reverts commit c8fd0cf. Caused heap-use-after-free
1 parent c03d184 commit 2be94d1

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

llvm/include/llvm/MC/MCPseudoProbe.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
#define LLVM_MC_MCPSEUDOPROBE_H
5656

5757
#include "llvm/ADT/DenseSet.h"
58-
#include "llvm/ADT/MapVector.h"
5958
#include "llvm/ADT/SmallVector.h"
6059
#include "llvm/ADT/StringRef.h"
6160
#include "llvm/IR/PseudoProbe.h"
@@ -300,7 +299,8 @@ class MCPseudoProbeSections {
300299
MCProbeDivisions[FuncSym].addPseudoProbe(Probe, InlineStack);
301300
}
302301

303-
using MCProbeDivisionMap = MapVector<MCSymbol *, MCPseudoProbeInlineTree>;
302+
// TODO: Sort by getOrdinal to ensure a determinstic section order
303+
using MCProbeDivisionMap = std::map<MCSymbol *, MCPseudoProbeInlineTree>;
304304

305305
private:
306306
// A collection of MCPseudoProbe for each function. The MCPseudoProbes are

0 commit comments

Comments
 (0)