From ffe6695acf1f011a2acda31624beee826fb68956 Mon Sep 17 00:00:00 2001 From: Greg Clayton Date: Wed, 4 Mar 2020 19:28:24 -0800 Subject: [PATCH] Fix buildbots with merge that didn't happen for 4050b01ba9ece02721ec496383baee219ca8cc2b. --- llvm/lib/DebugInfo/GSYM/GsymCreator.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/llvm/lib/DebugInfo/GSYM/GsymCreator.cpp b/llvm/lib/DebugInfo/GSYM/GsymCreator.cpp index f7d7afe..7d9b72c 100644 --- a/llvm/lib/DebugInfo/GSYM/GsymCreator.cpp +++ b/llvm/lib/DebugInfo/GSYM/GsymCreator.cpp @@ -29,7 +29,13 @@ uint32_t GsymCreator::insertFile(StringRef Path, llvm::sys::path::Style Style) { llvm::StringRef directory = llvm::sys::path::parent_path(Path, Style); llvm::StringRef filename = llvm::sys::path::filename(Path, Style); - FileEntry FE(insertString(directory), insertString(filename)); + // We must insert the strings first, then call the FileEntry constructor. + // If we inline the insertString() function call into the constructor, the + // call order is undefined due to parameter lists not having any ordering + // requirements. + const uint32_t Dir = insertString(directory); + const uint32_t Base = insertString(filename); + FileEntry FE(Dir, Base); std::lock_guard Guard(Mutex); const auto NextIndex = Files.size(); -- 2.7.4