diff --git a/include/llvm/Bitcode/LLVMBitCodes.h b/include/llvm/Bitcode/LLVMBitCodes.h
index ad8c40217a7..601777d11a8 100644
--- a/include/llvm/Bitcode/LLVMBitCodes.h
+++ b/include/llvm/Bitcode/LLVMBitCodes.h
@@ -242,16 +242,6 @@ namespace bitc {
     PEO_EXACT = 0
   };
 
-  /// Flags for serializing FPMathOperator's
-  /// SubclassOptionalData contents.
-  enum FastMathFlags {
-    FMF_UNSAFE_ALGEBRA   = 0,
-    FMF_NO_NANS          = 1,
-    FMF_NO_INFS          = 2,
-    FMF_NO_SIGNED_ZEROS  = 3,
-    FMF_ALLOW_RECIPROCAL = 4
-  };
-
   /// Encoded AtomicOrdering values.
   enum AtomicOrderingCodes {
     ORDERING_NOTATOMIC = 0,
diff --git a/lib/Bitcode/Reader/BitcodeReader.cpp b/lib/Bitcode/Reader/BitcodeReader.cpp
index cb1a8351858..131151f5354 100644
--- a/lib/Bitcode/Reader/BitcodeReader.cpp
+++ b/lib/Bitcode/Reader/BitcodeReader.cpp
@@ -2048,15 +2048,15 @@ bool BitcodeReader::ParseFunctionBody(Function *F) {
         } else if (isa<FPMathOperator>(I)) {
           FastMathFlags FMF;
           FMF.UnsafeAlgebra =
-            0 != (Record[OpNum] & (1 << bitc::FMF_UNSAFE_ALGEBRA));
+            0 != (Record[OpNum] & FPMathOperator::UnsafeAlgebra);
           FMF.NoNaNs =
-            0 != (Record[OpNum] & (1 << bitc::FMF_NO_NANS));
+            0 != (Record[OpNum] & FPMathOperator::NoNaNs);
           FMF.NoInfs =
-            0 != (Record[OpNum] & (1 << bitc::FMF_NO_INFS));
+            0 != (Record[OpNum] & FPMathOperator::NoInfs);
           FMF.NoSignedZeros =
-            0 != (Record[OpNum] & (1 << bitc::FMF_NO_SIGNED_ZEROS));
+            0 != (Record[OpNum] & FPMathOperator::NoSignedZeros);
           FMF.AllowReciprocal =
-            0 != (Record[OpNum] & (1 << bitc::FMF_ALLOW_RECIPROCAL));
+            0 != (Record[OpNum] & FPMathOperator::AllowReciprocal);
           if (FMF.any())
             I->setFastMathFlags(FMF);
         }
diff --git a/lib/Bitcode/Writer/BitcodeWriter.cpp b/lib/Bitcode/Writer/BitcodeWriter.cpp
index d616eda9b99..f2fe0aef68f 100644
--- a/lib/Bitcode/Writer/BitcodeWriter.cpp
+++ b/lib/Bitcode/Writer/BitcodeWriter.cpp
@@ -552,15 +552,15 @@ static uint64_t GetOptimizationFlags(const Value *V) {
   } else if (const FPMathOperator *FPMO =
              dyn_cast<const FPMathOperator>(V)) {
     if (FPMO->hasUnsafeAlgebra())
-      Flags |= 1 << bitc::FMF_UNSAFE_ALGEBRA;
+      Flags |= FPMathOperator::UnsafeAlgebra;
     if (FPMO->hasNoNaNs())
-      Flags |= 1 << bitc::FMF_NO_NANS;
+      Flags |= FPMathOperator::NoNaNs;
     if (FPMO->hasNoInfs())
-      Flags |= 1 << bitc::FMF_NO_INFS;
+      Flags |= FPMathOperator::NoInfs;
     if (FPMO->hasNoSignedZeros())
-      Flags |= 1 << bitc::FMF_NO_SIGNED_ZEROS;
+      Flags |= FPMathOperator::NoSignedZeros;
     if (FPMO->hasAllowReciprocal())
-      Flags |= 1 << bitc::FMF_ALLOW_RECIPROCAL;
+      Flags |= FPMathOperator::AllowReciprocal;
   }
 
   return Flags;