Merge pull request #157 from sx-aurora-dev/feature/merge-upstream-20220209

Feature/merge upstream 20220209

Author: kaz7

README.md

@@ -104,3 +104,10 @@ Consult the
 page for detailed information on configuring and compiling LLVM. You can visit
 [Directory Layout](https://llvm.org/docs/GettingStarted.html#directory-layout)
 to learn about the layout of the source code tree.
+
+## Getting in touch
+
+Join [LLVM Discourse forums](https://discourse.llvm.org/), [discord chat](https://discord.gg/xS7Z362) or #llvm IRC channel on [OFTC](https://oftc.net/).
+
+The LLVM project has adopted a [code of conduct](https://llvm.org/docs/CodeOfConduct.html) for
+participants to all modes of communication within the project.

bolt/include/bolt/Passes/LivenessAnalysis.h

@@ -11,6 +11,7 @@
 
 #include "bolt/Passes/DataflowAnalysis.h"
 #include "bolt/Passes/RegAnalysis.h"
+#include "llvm/MC/MCRegisterInfo.h"
 #include "llvm/Support/CommandLine.h"
 
 namespace opts {

bolt/include/bolt/Passes/ReachingDefOrUse.h

@@ -12,6 +12,7 @@
 #include "bolt/Passes/DataflowAnalysis.h"
 #include "bolt/Passes/RegAnalysis.h"
 #include "llvm/ADT/Optional.h"
+#include "llvm/MC/MCRegisterInfo.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Timer.h"
 

bolt/include/bolt/Passes/ShrinkWrapping.h

@@ -10,6 +10,7 @@
 #define BOLT_PASSES_SHRINKWRAPPING_H
 
 #include "bolt/Passes/FrameAnalysis.h"
+#include "llvm/MC/MCRegisterInfo.h"
 
 namespace llvm {
 namespace bolt {

bolt/include/bolt/Rewrite/DWARFRewriter.h

@@ -108,9 +108,6 @@ class DWARFRewriter {
   /// Output .dwp files.
   void writeDWP(std::unordered_map<uint64_t, std::string> &DWOIdToName);
 
-  /// Abbreviations that were converted to use DW_AT_ranges.
-  std::set<const DWARFAbbreviationDeclaration *> ConvertedRangesAbbrevs;
-
   /// DWARFDie contains a pointer to a DIE and hence gets invalidated once the
   /// embedded DIE is destroyed. This wrapper class stores a DIE internally and
   /// could be cast to a DWARFDie that is valid even after the initial DIE is
@@ -135,8 +132,6 @@ class DWARFRewriter {
       const DWARFAbbreviationDeclaration *,
       std::vector<std::pair<DWARFDieWrapper, DebugAddressRange>>>;
 
-  PendingRangesType PendingRanges;
-
   /// Convert \p Abbrev from using a simple DW_AT_(low|high)_pc range to
   /// DW_AT_ranges with optional \p RangesBase.
   void convertToRangesPatchAbbrev(const DWARFUnit &Unit,
@@ -151,30 +146,10 @@ class DWARFRewriter {
                                      SimpleBinaryPatcher &DebugInfoPatcher,
                                      Optional<uint64_t> RangesBase = None);
 
-  /// Same as above, but takes a vector of \p Ranges as a parameter.
-  void convertToRanges(DWARFDie DIE, const DebugAddressRangesVector &Ranges,
-                       SimpleBinaryPatcher &DebugInfoPatcher);
-
   /// Patch DW_AT_(low|high)_pc values for the \p DIE based on \p Range.
   void patchLowHigh(DWARFDie DIE, DebugAddressRange Range,
-                    SimpleBinaryPatcher &DebugInfoPatcher);
-
-  /// Convert pending ranges associated with the given \p Abbrev.
-  void convertPending(const DWARFUnit &Unit,
-                      const DWARFAbbreviationDeclaration *Abbrev,
-                      SimpleBinaryPatcher &DebugInfoPatcher,
-                      DebugAbbrevWriter &AbbrevWriter);
-
-  /// Adds to Pending Ranges.
-  /// For Debug Fission also adding to .debug_addr to take care of a case where
-  /// some entries are not converted to ranges and left as
-  /// DW_AT_low_pc/DW_AT_high_pc.
-  void addToPendingRanges(const DWARFAbbreviationDeclaration *Abbrev,
-                          DWARFDie DIE, DebugAddressRangesVector &Ranges,
-                          Optional<uint64_t> DWOId);
-
-  /// Once all DIEs were seen, update DW_AT_(low|high)_pc values.
-  void flushPendingRanges(SimpleBinaryPatcher &DebugInfoPatcher);
+                    SimpleBinaryPatcher &DebugInfoPatcher,
+                    Optional<uint64_t> DWOId);
 
   /// Helper function for creating and returning per-DWO patchers/writers.
   template <class T, class Patcher>

bolt/lib/Core/BinaryContext.cpp

@@ -26,8 +26,10 @@
 #include "llvm/MC/MCInstPrinter.h"
 #include "llvm/MC/MCObjectStreamer.h"
 #include "llvm/MC/MCObjectWriter.h"
+#include "llvm/MC/MCRegisterInfo.h"
 #include "llvm/MC/MCSectionELF.h"
 #include "llvm/MC/MCStreamer.h"
+#include "llvm/MC/MCSubtargetInfo.h"
 #include "llvm/MC/MCSymbol.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Regex.h"

bolt/lib/Core/BinaryFunction.cpp

@@ -28,6 +28,7 @@
 #include "llvm/MC/MCExpr.h"
 #include "llvm/MC/MCInst.h"
 #include "llvm/MC/MCInstPrinter.h"
+#include "llvm/MC/MCRegisterInfo.h"
 #include "llvm/Object/ObjectFile.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Debug.h"

bolt/lib/Core/DebugData.cpp

@@ -13,6 +13,7 @@
 #include "bolt/Core/DebugData.h"
 #include "bolt/Core/BinaryContext.h"
 #include "bolt/Utils/Utils.h"
+#include "llvm/MC/MCAssembler.h"
 #include "llvm/MC/MCContext.h"
 #include "llvm/MC/MCObjectStreamer.h"
 #include "llvm/Support/CommandLine.h"

bolt/lib/Core/MCPlusBuilder.cpp

@@ -16,6 +16,7 @@
 #include "llvm/MC/MCInstrAnalysis.h"
 #include "llvm/MC/MCInstrDesc.h"
 #include "llvm/MC/MCInstrInfo.h"
+#include "llvm/MC/MCRegisterInfo.h"
 #include "llvm/Support/Debug.h"
 #include <cstdint>
 #include <queue>

bolt/lib/Core/Relocation.cpp

@@ -12,7 +12,9 @@
 
 #include "bolt/Core/Relocation.h"
 #include "llvm/MC/MCContext.h"
+#include "llvm/MC/MCExpr.h"
 #include "llvm/MC/MCStreamer.h"
+#include "llvm/MC/MCSymbol.h"
 #include "llvm/Object/ELF.h"
 
 using namespace llvm;