2 files changed, 2 insertions, 24 deletions
diff --git a/llvm/lib/MC/MCAssembler.cpp b/llvm/lib/MC/MCAssembler.cpp
index b8b60af8fb7..d5ff94996fb 100644
--- a/llvm/lib/MC/MCAssembler.cpp
+++ b/llvm/lib/MC/MCAssembler.cpp
@@ -394,8 +394,7 @@ void MCAssembler::LayoutFragment(MCAsmLayout &Layout, MCFragment &F) {
     break;
 
   case MCFragment::FT_Fill: {
-    MCFillFragment &FF = cast<MCFillFragment>(F);
-    EffectiveSize = FF.getSize();
+    EffectiveSize = cast<MCFillFragment>(F).getSize();
     break;
   }
 
@@ -419,11 +418,6 @@ void MCAssembler::LayoutFragment(MCAsmLayout &Layout, MCFragment &F) {
     EffectiveSize = Offset;
     break;
   }
-
-  case MCFragment::FT_ZeroFill: {
-    EffectiveSize = cast<MCZeroFillFragment>(F).getSize();
-    break;
-  }
   }
 
   Layout.setFragmentEffectiveSize(&F, EffectiveSize);
@@ -562,11 +556,6 @@ static void WriteFragmentData(const MCAssembler &Asm, const MCAsmLayout &Layout,
 
     break;
   }
-
-  case MCFragment::FT_ZeroFill: {
-    assert(0 && "Invalid zero fill fragment in concrete section!");
-    break;
-  }
   }
 
   assert(OW->getStream().tell() - Start == FragmentSize);
@@ -596,8 +585,6 @@ void MCAssembler::WriteSectionData(const MCSectionData *SD,
         assert(!cast<MCFillFragment>(it)->getValueSize() &&
                "Invalid fill in virtual section!");
         break;
-      case MCFragment::FT_ZeroFill:
-        break;
       }
     }
 
@@ -922,15 +909,6 @@ void MCOrgFragment::dump() {
   OS << " Offset:" << getOffset() << " Value:" << getValue() << ">";
 }
 
-void MCZeroFillFragment::dump() {
-  raw_ostream &OS = llvm::errs();
-
-  OS << "<MCZeroFillFragment ";
-  this->MCFragment::dump();
-  OS << "\n       ";
-  OS << " Size:" << getSize() << ">";
-}
-
 void MCSectionData::dump() {
   raw_ostream &OS = llvm::errs();
 
diff --git a/llvm/lib/MC/MCMachOStreamer.cpp b/llvm/lib/MC/MCMachOStreamer.cpp
index eb49a40707d..fe701a7c280 100644
--- a/llvm/lib/MC/MCMachOStreamer.cpp
+++ b/llvm/lib/MC/MCMachOStreamer.cpp
@@ -326,7 +326,7 @@ void MCMachOStreamer::EmitZerofill(const MCSection *Section, MCSymbol *Symbol,
     new MCAlignFragment(ByteAlignment, 0, 0, ByteAlignment, /*EmitNops=*/false,
                         &SectData);
 
-  MCFragment *F = new MCZeroFillFragment(Size, &SectData);
+  MCFragment *F = new MCFillFragment(0, 0, Size, &SectData);
   SD.setFragment(F);
   if (Assembler.isSymbolLinkerVisible(&SD))
     F->setAtom(&SD);