From 2d9da4dc501d71a4be5f56c40ed47a9f3ce8430e Mon Sep 17 00:00:00 2001 From: Teresa Johnson Date: Mon, 1 Feb 2016 20:16:35 +0000 Subject: [PATCH] [ThinLTO] Ensure function summary output order is stable Iterate over the function list instead of a DenseMap of Function pointers when emitting the function summary into the module. This fixes PR26419. llvm-svn: 259398 --- llvm/lib/Bitcode/Writer/BitcodeWriter.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp b/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp index 3f1d268..5f85882 100644 --- a/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp +++ b/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp @@ -2800,16 +2800,22 @@ static void WritePerModuleFunctionSummary( unsigned FSAbbrev = Stream.EmitAbbrev(Abbv); SmallVector NameVals; - for (auto &I : FunctionIndex) { + // Iterate over the list of functions instead of the FunctionIndex map to + // ensure the ordering is stable. + for (const Function &F : *M) { + if (F.isDeclaration()) + continue; // Skip anonymous functions. We will emit a function summary for // any aliases below. - if (!I.first->hasName()) + if (!F.hasName()) continue; + assert(FunctionIndex.count(&F) == 1); + WritePerModuleFunctionSummaryRecord( - NameVals, I.second->functionSummary(), - VE.getValueID(M->getValueSymbolTable().lookup(I.first->getName())), - FSAbbrev, Stream); + NameVals, FunctionIndex[&F]->functionSummary(), + VE.getValueID(M->getValueSymbolTable().lookup(F.getName())), FSAbbrev, + Stream); } for (const GlobalAlias &A : M->aliases()) { -- 2.7.4