[BOLT] Fix C++ ABI function alignment.

Summary: C++ functions have to be aligned at 2-bytes minimum on x86-64. (cherry picked from FBD5128185)
llvm · May 25, 2017 · 174e3a8 · 174e3a8
1 parent 5cd5896
commit 174e3a8
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/bolt/RewriteInstance.cpp b/bolt/RewriteInstance.cpp
@@ -1884,10 +1884,9 @@ void emitFunction(MCStreamer &Streamer, BinaryFunction &Function,
   Streamer.SwitchSection(Section);
 
   if (opts::Relocs) {
-    Streamer.EmitCodeAlignment(std::max((unsigned)opts::AlignFunctions,
-                                        BinaryFunction::MinAlign),
-                               std::max((unsigned)opts::AlignFunctionsMaxBytes,
-                                        BinaryFunction::MinAlign - 1));
+    Streamer.EmitCodeAlignment(BinaryFunction::MinAlign);
+    Streamer.EmitCodeAlignment(opts::AlignFunctions,
+                               opts::AlignFunctionsMaxBytes);
   } else {
     Streamer.EmitCodeAlignment(Function.getAlignment());
     Streamer.setCodeSkew(EmitColdPart ? 0 : Function.getAddress());