diff --git a/llvm/lib/MC/MCAssembler.cpp b/llvm/lib/MC/MCAssembler.cpp
index 006f7b5fe402f1e07310864f0e28629b5f0efda9..8db52e0a37b9311a3fe0306563e53e0d74a12820 100644
--- a/llvm/lib/MC/MCAssembler.cpp
+++ b/llvm/lib/MC/MCAssembler.cpp
@@ -694,7 +694,7 @@ bool MCAssembler::fixupNeedsRelaxation(const MCFixup &Fixup,
                                        const MCAsmLayout &Layout) const {
   MCValue Target;
   uint64_t Value;
-  unsigned int KsError;
+  unsigned int KsError = 0;
   bool Resolved = evaluateFixup(Layout, Fixup, DF, Target, Value, KsError);
   return getBackend().fixupNeedsRelaxationAdvanced(Fixup, Resolved, Value, DF,
                                                    Layout);
@@ -736,7 +736,7 @@ bool MCAssembler::relaxInstruction(MCAsmLayout &Layout,
   SmallVector<MCFixup, 4> Fixups;
   SmallString<256> Code;
   raw_svector_ostream VecOS(Code);
-  unsigned int KsError;
+  unsigned int KsError = 0;
   getEmitter().encodeInstruction(Relaxed, VecOS, Fixups, F.getSubtargetInfo(), KsError);
 
   // Update the fragment.
diff --git a/llvm/lib/Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp b/llvm/lib/Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp
index 6044849284239cc950f44b104f855a7b56990b62..e9c7c133b81a92f650dd7179c2041101a0298b8c 100644
--- a/llvm/lib/Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp
+++ b/llvm/lib/Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp
@@ -297,6 +297,7 @@ static bool HasSecRelSymbolRef(const MCExpr *Expr) {
 // return false if Imm value is invalid for a given size
 static bool validImmRange(uint64_t Imm, unsigned int Size)
 {
+    return true;
     switch(Size) {
         default:
             return true;