diff options
author | Eli Friedman <eli.friedman@gmail.com> | 2011-08-16 01:28:22 +0000 |
---|---|---|
committer | Eli Friedman <eli.friedman@gmail.com> | 2011-08-16 01:28:22 +0000 |
commit | a917d4f9b4188fa330f9e89108e8c8d804a0ed22 (patch) | |
tree | ec44b78f6d678837a4d6b22d543acb6adf76ebaa /llvm/lib/Transforms | |
parent | 311186a6ef20c1636b6b12aab7b727d85fc5d55a (diff) | |
download | bcm5719-llvm-a917d4f9b4188fa330f9e89108e8c8d804a0ed22.tar.gz bcm5719-llvm-a917d4f9b4188fa330f9e89108e8c8d804a0ed22.zip |
Revert a bit of r137667; the logic in question can safely handle atomic load/store.
llvm-svn: 137702
Diffstat (limited to 'llvm/lib/Transforms')
-rw-r--r-- | llvm/lib/Transforms/IPO/FunctionAttrs.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/llvm/lib/Transforms/IPO/FunctionAttrs.cpp b/llvm/lib/Transforms/IPO/FunctionAttrs.cpp index c43f4b9870a..0edf3427507 100644 --- a/llvm/lib/Transforms/IPO/FunctionAttrs.cpp +++ b/llvm/lib/Transforms/IPO/FunctionAttrs.cpp @@ -163,15 +163,15 @@ bool FunctionAttrs::AddReadAttrs(const CallGraphSCC &SCC) { ReadsMemory = true; continue; } else if (LoadInst *LI = dyn_cast<LoadInst>(I)) { - // Ignore non-volatile loads from local memory. - if (LI->isUnordered()) { + // Ignore non-volatile loads from local memory. (Atomic is okay here.) + if (!LI->isVolatile()) { AliasAnalysis::Location Loc = AA->getLocation(LI); if (AA->pointsToConstantMemory(Loc, /*OrLocal=*/true)) continue; } } else if (StoreInst *SI = dyn_cast<StoreInst>(I)) { - // Ignore non-volatile stores to local memory. - if (SI->isUnordered()) { + // Ignore non-volatile stores to local memory. (Atomic is okay here.) + if (!SI->isVolatile()) { AliasAnalysis::Location Loc = AA->getLocation(SI); if (AA->pointsToConstantMemory(Loc, /*OrLocal=*/true)) continue; |