diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Analysis/InstructionSimplify.cpp | 4 | ||||
-rw-r--r-- | lib/AsmParser/LLParser.h | 10 | ||||
-rw-r--r-- | lib/Bitcode/Reader/BitcodeReader.cpp | 20 | ||||
-rw-r--r-- | lib/Bitcode/Writer/BitcodeWriter.cpp | 10 |
4 files changed, 22 insertions, 22 deletions
diff --git a/lib/Analysis/InstructionSimplify.cpp b/lib/Analysis/InstructionSimplify.cpp index dfac8fdc25..00689475a4 100644 --- a/lib/Analysis/InstructionSimplify.cpp +++ b/lib/Analysis/InstructionSimplify.cpp @@ -900,8 +900,8 @@ static Value *SimplifyFMulInst(Value *Op0, Value *Op1, } // Check for some fast-math optimizations - if (FMF.NoNaNs) { - if (FMF.NoSignedZeros) { + if (FMF.noNaNs()) { + if (FMF.noSignedZeros()) { // fmul N S 0, x ==> 0 if (match(Op0, m_Zero())) return Op0; diff --git a/lib/AsmParser/LLParser.h b/lib/AsmParser/LLParser.h index 0039164cc7..3a38159d80 100644 --- a/lib/AsmParser/LLParser.h +++ b/lib/AsmParser/LLParser.h @@ -160,11 +160,11 @@ namespace llvm { FastMathFlags FMF; while (true) switch (Lex.getKind()) { - case lltok::kw_fast: FMF.UnsafeAlgebra = true; Lex.Lex(); continue; - case lltok::kw_nnan: FMF.NoNaNs = true; Lex.Lex(); continue; - case lltok::kw_ninf: FMF.NoInfs = true; Lex.Lex(); continue; - case lltok::kw_nsz: FMF.NoSignedZeros = true; Lex.Lex(); continue; - case lltok::kw_arcp: FMF.AllowReciprocal = true; Lex.Lex(); continue; + case lltok::kw_fast: FMF.setUnsafeAlgebra(); Lex.Lex(); continue; + case lltok::kw_nnan: FMF.setNoNaNs(); Lex.Lex(); continue; + case lltok::kw_ninf: FMF.setNoInfs(); Lex.Lex(); continue; + case lltok::kw_nsz: FMF.setNoSignedZeros(); Lex.Lex(); continue; + case lltok::kw_arcp: FMF.setAllowReciprocal(); Lex.Lex(); continue; default: return FMF; } return FMF; diff --git a/lib/Bitcode/Reader/BitcodeReader.cpp b/lib/Bitcode/Reader/BitcodeReader.cpp index 131151f535..1fdea799d0 100644 --- a/lib/Bitcode/Reader/BitcodeReader.cpp +++ b/lib/Bitcode/Reader/BitcodeReader.cpp @@ -2047,16 +2047,16 @@ bool BitcodeReader::ParseFunctionBody(Function *F) { cast<BinaryOperator>(I)->setIsExact(true); } else if (isa<FPMathOperator>(I)) { FastMathFlags FMF; - FMF.UnsafeAlgebra = - 0 != (Record[OpNum] & FPMathOperator::UnsafeAlgebra); - FMF.NoNaNs = - 0 != (Record[OpNum] & FPMathOperator::NoNaNs); - FMF.NoInfs = - 0 != (Record[OpNum] & FPMathOperator::NoInfs); - FMF.NoSignedZeros = - 0 != (Record[OpNum] & FPMathOperator::NoSignedZeros); - FMF.AllowReciprocal = - 0 != (Record[OpNum] & FPMathOperator::AllowReciprocal); + if (0 != (Record[OpNum] & FastMathFlags::UnsafeAlgebra)) + FMF.setUnsafeAlgebra(); + if (0 != (Record[OpNum] & FastMathFlags::NoNaNs)) + FMF.setNoNaNs(); + if (0 != (Record[OpNum] & FastMathFlags::NoInfs)) + FMF.setNoInfs(); + if (0 != (Record[OpNum] & FastMathFlags::NoSignedZeros)) + FMF.setNoSignedZeros(); + if (0 != (Record[OpNum] & FastMathFlags::AllowReciprocal)) + FMF.setAllowReciprocal(); if (FMF.any()) I->setFastMathFlags(FMF); } diff --git a/lib/Bitcode/Writer/BitcodeWriter.cpp b/lib/Bitcode/Writer/BitcodeWriter.cpp index f2fe0aef68..ffe95d8f27 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 |= FPMathOperator::UnsafeAlgebra; + Flags |= FastMathFlags::UnsafeAlgebra; if (FPMO->hasNoNaNs()) - Flags |= FPMathOperator::NoNaNs; + Flags |= FastMathFlags::NoNaNs; if (FPMO->hasNoInfs()) - Flags |= FPMathOperator::NoInfs; + Flags |= FastMathFlags::NoInfs; if (FPMO->hasNoSignedZeros()) - Flags |= FPMathOperator::NoSignedZeros; + Flags |= FastMathFlags::NoSignedZeros; if (FPMO->hasAllowReciprocal()) - Flags |= FPMathOperator::AllowReciprocal; + Flags |= FastMathFlags::AllowReciprocal; } return Flags; |