From 33cb445fb68589d59172e02253367cfae700d4b1 Mon Sep 17 00:00:00 2001 From: Eli Friedman Date: Tue, 16 Aug 2011 00:20:11 +0000 Subject: [PATCH] Minor comment fixes. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@137693 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Transforms/IPO/GlobalOpt.cpp | 10 ++++++---- lib/Transforms/Utils/SimplifyCFG.cpp | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/Transforms/IPO/GlobalOpt.cpp b/lib/Transforms/IPO/GlobalOpt.cpp index 6904b7c6114..80b11ed792b 100644 --- a/lib/Transforms/IPO/GlobalOpt.cpp +++ b/lib/Transforms/IPO/GlobalOpt.cpp @@ -195,12 +195,14 @@ static bool AnalyzeGlobal(const Value *V, GlobalStatus &GS, } if (const LoadInst *LI = dyn_cast(I)) { GS.isLoaded = true; - if (!LI->isSimple()) return true; // Don't hack on volatile loads. + // Don't hack on volatile/atomic loads. + if (!LI->isSimple()) return true; } else if (const StoreInst *SI = dyn_cast(I)) { // Don't allow a store OF the address, only stores TO the address. if (SI->getOperand(0) == V) return true; - if (!SI->isSimple()) return true; // Don't hack on volatile stores. + // Don't hack on volatile/atomic stores. + if (!SI->isSimple()) return true; // If this is a direct store to the global (i.e., the global is a scalar // value, not an aggregate), keep more specific information about @@ -2333,7 +2335,7 @@ static bool EvaluateFunction(Function *F, Constant *&RetVal, Constant *InstResult = 0; if (StoreInst *SI = dyn_cast(CurInst)) { - if (!SI->isSimple()) return false; // no volatile accesses. + if (!SI->isSimple()) return false; // no volatile/atomic accesses. Constant *Ptr = getVal(Values, SI->getOperand(1)); if (!isSimpleEnoughPointerToCommit(Ptr)) // If this is too complex for us to commit, reject it. @@ -2410,7 +2412,7 @@ static bool EvaluateFunction(Function *F, Constant *&RetVal, ConstantExpr::getGetElementPtr(P, GEPOps, cast(GEP)->isInBounds()); } else if (LoadInst *LI = dyn_cast(CurInst)) { - if (!LI->isSimple()) return false; // no volatile accesses. + if (!LI->isSimple()) return false; // no volatile/atomic accesses. InstResult = ComputeLoadResult(getVal(Values, LI->getOperand(0)), MutatedMemory); if (InstResult == 0) return false; // Could not evaluate load. diff --git a/lib/Transforms/Utils/SimplifyCFG.cpp b/lib/Transforms/Utils/SimplifyCFG.cpp index 850ee490056..2d60c35afb1 100644 --- a/lib/Transforms/Utils/SimplifyCFG.cpp +++ b/lib/Transforms/Utils/SimplifyCFG.cpp @@ -2269,7 +2269,7 @@ bool SimplifyCFGOpt::SimplifyUnreachable(UnreachableInst *UI) { // Note that deleting LandingPad's here is in fact okay, although it // involves a bit of subtle reasoning. If this inst is a LandingPad, // all the predecessors of this block will be the unwind edges of Invokes, - // and we can therefore guaranteed this block will be erased. + // and we can therefore guarantee this block will be erased. } // Delete this instruction (any uses are guaranteed to be dead)