Kyvangka1610
diff --git a/‎bolt/include/bolt/Core/MCPlusBuilder.h‎
Lines changed: 2 additions & 6 deletions b/‎bolt/include/bolt/Core/MCPlusBuilder.h‎
Lines changed: 2 additions & 6 deletions
diff --git a/‎bolt/include/bolt/Utils/CommandLineOpts.h‎
Lines changed: 1 addition & 0 deletions b/‎bolt/include/bolt/Utils/CommandLineOpts.h‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎bolt/lib/Core/BinaryEmitter.cpp‎
Lines changed: 6 additions & 0 deletions b/‎bolt/lib/Core/BinaryEmitter.cpp‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎bolt/lib/Passes/Aligner.cpp‎
Lines changed: 1 addition & 7 deletions b/‎bolt/lib/Passes/Aligner.cpp‎
Lines changed: 1 addition & 7 deletions
diff --git a/‎bolt/lib/Passes/BinaryPasses.cpp‎
Lines changed: 1 addition & 1 deletion b/‎bolt/lib/Passes/BinaryPasses.cpp‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎bolt/lib/Passes/LongJmp.cpp‎
Lines changed: 28 additions & 15 deletions b/‎bolt/lib/Passes/LongJmp.cpp‎
Lines changed: 28 additions & 15 deletions
diff --git a/‎bolt/lib/Rewrite/DWARFRewriter.cpp‎
Lines changed: 0 additions & 4 deletions b/‎bolt/lib/Rewrite/DWARFRewriter.cpp‎
Lines changed: 0 additions & 4 deletions
diff --git a/‎bolt/lib/Rewrite/RewriteInstance.cpp‎
Lines changed: 3 additions & 0 deletions b/‎bolt/lib/Rewrite/RewriteInstance.cpp‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎bolt/lib/Target/AArch64/AArch64MCPlusBuilder.cpp‎
Lines changed: 3 additions & 1 deletion b/‎bolt/lib/Target/AArch64/AArch64MCPlusBuilder.cpp‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎bolt/lib/Target/X86/CMakeLists.txt‎
Lines changed: 1 addition & 0 deletions b/‎bolt/lib/Target/X86/CMakeLists.txt‎
Lines changed: 1 addition & 0 deletions
@@ -526,11 +526,6 @@ class MCPlusBuilder {
     return false;
   }
 
-  virtual bool isMOVSX64rm32(const MCInst &Inst) const {
-    llvm_unreachable("not implemented");
-    return false;
-  }
-
   virtual bool isLeave(const MCInst &Inst) const {
     llvm_unreachable("not implemented");
     return false;
@@ -1287,7 +1282,8 @@ class MCPlusBuilder {
 
   /// Replace instruction with a shorter version that could be relaxed later
   /// if needed.
-  virtual bool shortenInstruction(MCInst &Inst) const {
+  virtual bool shortenInstruction(MCInst &Inst,
+                                  const MCSubtargetInfo &STI) const {
     llvm_unreachable("not implemented");
     return false;
   }
 
@@ -30,6 +30,7 @@ extern llvm::cl::OptionCategory BoltInstrCategory;
 extern llvm::cl::OptionCategory HeatmapCategory;
 
 extern llvm::cl::opt<unsigned> AlignText;
+extern llvm::cl::opt<unsigned> AlignFunctions;
 extern llvm::cl::opt<bool> AggregateOnly;
 extern llvm::cl::opt<unsigned> BucketsPerLine;
 extern llvm::cl::opt<bool> DiffOnly;
 
@@ -291,6 +291,12 @@ bool BinaryEmitter::emitFunction(BinaryFunction &Function, bool EmitColdPart) {
   BC.Ctx->addGenDwarfSection(Section);
 
   if (BC.HasRelocations) {
+    // Set section alignment to at least maximum possible object alignment.
+    // We need this to support LongJmp and other passes that calculates
+    // tentative layout.
+    if (Section->getAlignment() < opts::AlignFunctions)
+      Section->setAlignment(Align(opts::AlignFunctions));
+
     Streamer.emitCodeAlignment(BinaryFunction::MinAlign, &*BC.STI);
     uint16_t MaxAlignBytes = EmitColdPart ? Function.getMaxColdAlignmentBytes()
                                           : Function.getMaxAlignmentBytes();
 
@@ -23,6 +23,7 @@ extern cl::OptionCategory BoltOptCategory;
 
 extern cl::opt<bool> AlignBlocks;
 extern cl::opt<bool> PreserveBlocksAlignment;
+extern cl::opt<unsigned> AlignFunctions;
 
 cl::opt<unsigned>
 AlignBlocksMinSize("align-blocks-min-size",
@@ -43,13 +44,6 @@ AlignBlocksThreshold("align-blocks-threshold",
   cl::Hidden,
   cl::cat(BoltOptCategory));
 
-cl::opt<unsigned>
-AlignFunctions("align-functions",
-  cl::desc("align functions at a given value (relocation mode)"),
-  cl::init(64),
-  cl::ZeroOrMore,
-  cl::cat(BoltOptCategory));
-
 cl::opt<unsigned>
 AlignFunctionsMaxBytes("align-functions-max-bytes",
   cl::desc("maximum number of bytes to use to align functions"),
 
@@ -1011,7 +1011,7 @@ uint64_t ShortenInstructions::shortenInstructions(BinaryFunction &Function) {
       if (opts::Verbosity > 2)
         OriginalInst = Inst;
 
-      if (!BC.MIB->shortenInstruction(Inst))
+      if (!BC.MIB->shortenInstruction(Inst, *BC.STI))
         continue;
 
       if (opts::Verbosity > 2) {
 
@@ -11,15 +11,15 @@
 //===----------------------------------------------------------------------===//
 
 #include "bolt/Passes/LongJmp.h"
-#include "llvm/Support/Alignment.h"
 
 #define DEBUG_TYPE "longjmp"
 
 using namespace llvm;
 
 namespace opts {
 extern cl::OptionCategory BoltOptCategory;
-
+extern llvm::cl::opt<unsigned> AlignText;
+extern cl::opt<unsigned> AlignFunctions;
 extern cl::opt<bool> UseOldText;
 extern cl::opt<bool> HotFunctionsAtEnd;
 
@@ -295,6 +295,7 @@ void LongJmpPass::tentativeBBLayout(const BinaryFunction &Func) {
 uint64_t LongJmpPass::tentativeLayoutRelocColdPart(
     const BinaryContext &BC, std::vector<BinaryFunction *> &SortedFunctions,
     uint64_t DotAddress) {
+  DotAddress = alignTo(DotAddress, llvm::Align(opts::AlignFunctions));
   for (BinaryFunction *Func : SortedFunctions) {
     if (!Func->isSplit())
       continue;
@@ -321,14 +322,20 @@ uint64_t LongJmpPass::tentativeLayoutRelocMode(
   uint32_t CurrentIndex = 0;
   if (opts::HotFunctionsAtEnd) {
     for (BinaryFunction *BF : SortedFunctions) {
-      if (BF->hasValidIndex() && LastHotIndex == -1u)
+      if (BF->hasValidIndex()) {
         LastHotIndex = CurrentIndex;
+        break;
+      }
+
       ++CurrentIndex;
     }
   } else {
     for (BinaryFunction *BF : SortedFunctions) {
-      if (!BF->hasValidIndex() && LastHotIndex == -1u)
+      if (!BF->hasValidIndex()) {
         LastHotIndex = CurrentIndex;
+        break;
+      }
+
       ++CurrentIndex;
     }
   }
@@ -342,7 +349,7 @@ uint64_t LongJmpPass::tentativeLayoutRelocMode(
           tentativeLayoutRelocColdPart(BC, SortedFunctions, DotAddress);
       ColdLayoutDone = true;
       if (opts::HotFunctionsAtEnd)
-        DotAddress = alignTo(DotAddress, BC.PageAlign);
+        DotAddress = alignTo(DotAddress, opts::AlignText);
     }
 
     DotAddress = alignTo(DotAddress, BinaryFunction::MinAlign);
@@ -385,18 +392,24 @@ void LongJmpPass::tentativeLayout(
   }
 
   // Relocation mode
-  uint64_t EstimatedTextSize = tentativeLayoutRelocMode(BC, SortedFunctions, 0);
-
-  // Initial padding
-  if (opts::UseOldText && EstimatedTextSize <= BC.OldTextSectionSize) {
-    DotAddress = BC.OldTextSectionAddress;
-    uint64_t Pad = offsetToAlignment(DotAddress, llvm::Align(BC.PageAlign));
-    if (Pad + EstimatedTextSize <= BC.OldTextSectionSize)
-      DotAddress += Pad;
-  } else {
-    DotAddress = alignTo(BC.LayoutStartAddress, BC.PageAlign);
+  uint64_t EstimatedTextSize = 0;
+  if (opts::UseOldText) {
+    EstimatedTextSize = tentativeLayoutRelocMode(BC, SortedFunctions, 0);
+
+    // Initial padding
+    if (EstimatedTextSize <= BC.OldTextSectionSize) {
+      DotAddress = BC.OldTextSectionAddress;
+      uint64_t Pad =
+          offsetToAlignment(DotAddress, llvm::Align(opts::AlignText));
+      if (Pad + EstimatedTextSize <= BC.OldTextSectionSize) {
+        DotAddress += Pad;
+      }
+    }
   }
 
+  if (!EstimatedTextSize || EstimatedTextSize > BC.OldTextSectionSize)
+    DotAddress = alignTo(BC.LayoutStartAddress, opts::AlignText);
+
   tentativeLayoutRelocMode(BC, SortedFunctions, DotAddress);
 }
 
 
@@ -149,10 +149,6 @@ getDWOName(llvm::DWARFUnit &CU,
   return DWOName;
 }
 
-static bool isHighPcFormEightBytes(dwarf::Form DwarfForm) {
-  return DwarfForm == dwarf::DW_FORM_addr || DwarfForm == dwarf::DW_FORM_data8;
-}
-
 void DWARFRewriter::updateDebugInfo() {
   ErrorOr<BinarySection &> DebugInfo = BC.getUniqueSectionByName(".debug_info");
   if (!DebugInfo)
 
@@ -1743,6 +1743,9 @@ void RewriteInstance::adjustCommandLineOptions() {
   if (!opts::AlignText.getNumOccurrences())
     opts::AlignText = BC->PageAlign;
 
+  if (opts::AlignText < opts::AlignFunctions)
+    opts::AlignText = (unsigned)opts::AlignFunctions;
+
   if (BC->isX86() && opts::Lite.getNumOccurrences() == 0 && !opts::StrictMode &&
       !opts::UseOldText)
     opts::Lite = true;
 
@@ -51,7 +51,9 @@ class AArch64MCPlusBuilder : public MCPlusBuilder {
     return false;
   }
 
-  bool shortenInstruction(MCInst &) const override { return false; }
+  bool shortenInstruction(MCInst &, const MCSubtargetInfo &) const override {
+    return false;
+  }
 
   bool isADRP(const MCInst &Inst) const override {
     return Inst.getOpcode() == AArch64::ADRP;
 
@@ -1,5 +1,6 @@
 set(LLVM_LINK_COMPONENTS
   BOLTCore
+  BOLTUtils
   MC
   Object
   Support
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,9 @@ class AArch64MCPlusBuilder : public MCPlusBuilder {`
`51`	`51`	`return false;`
`52`	`52`	`}`
`53`	`53`
`54`		`- bool shortenInstruction(MCInst &) const override { return false; }`
	`54`	`+ bool shortenInstruction(MCInst &, const MCSubtargetInfo &) const override {`
	`55`	`+ return false;`
	`56`	`+ }`
`55`	`57`
`56`	`58`	`bool isADRP(const MCInst &Inst) const override {`
`57`	`59`	`return Inst.getOpcode() == AArch64::ADRP;`