commit 8603062ee4904af2a7258c2e551096d84c243e0e
author Nirav Dave <niravd@google.com> Mon Jul 11 14:23:53 2016 +0000
committer Nirav Dave <niravd@google.com> Mon Jul 11 14:23:53 2016 +0000
tree 3ae88b821eecac8c0bf2dfcf95854b3573b56e91
parent b42895199065078ce424bc4f328bae533de50576

Fix branch relaxation in 16-bit mode.

Thread through MCSubtargetInfo to relaxInstruction function allowing relaxation
to generate jumps with 16-bit sized immediates in 16-bit mode.

This fixes PR22097.

Reviewers: dwmw2, tstellarAMD, craig.topper, jyknight

Subscribers: jfb, arsenm, jyknight, llvm-commits, dsanders

Differential Revision: http://reviews.llvm.org/D20830

llvm-svn: 275068

llvm/lib/MC/MCAssembler.cpp

diff --git a/llvm/lib/MC/MCAssembler.cpp b/llvm/lib/MC/MCAssembler.cpp
index fdcd8c7..7a42108 100644
--- a/llvm/lib/MC/MCAssembler.cpp
+++ b/llvm/lib/MC/MCAssembler.cpp
@@ -765,7 +765,7 @@
   // Relax the fragment.
 
   MCInst Relaxed;
-  getBackend().relaxInstruction(F.getInst(), Relaxed);
+  getBackend().relaxInstruction(F.getInst(), F.getSubtargetInfo(), Relaxed);
 
   // Encode the new instruction.
   //