diff --git a/lib/Analysis/AliasSetTracker.cpp b/lib/Analysis/AliasSetTracker.cpp
index 4a293448ed3..a3d58d90e9f 100644
--- a/lib/Analysis/AliasSetTracker.cpp
+++ b/lib/Analysis/AliasSetTracker.cpp
@@ -20,8 +20,7 @@
 #include "llvm/Target/TargetData.h"
 #include "llvm/Assembly/Writer.h"
 #include "llvm/Support/InstIterator.h"
-
-namespace llvm {
+using namespace llvm;
 
 /// mergeSetIn - Merge the specified alias set into this alias set...
 ///
@@ -190,16 +189,21 @@ AliasSet &AliasSetTracker::getAliasSetForPointer(Value *Pointer, unsigned Size){
 }
 
 void AliasSetTracker::add(LoadInst *LI) {
-  addPointer(LI->getOperand(0),
-             AA.getTargetData().getTypeSize(LI->getType()), AliasSet::Refs);
+  AliasSet &AS = 
+    addPointer(LI->getOperand(0),
+               AA.getTargetData().getTypeSize(LI->getType()), AliasSet::Refs);
+  if (LI->isVolatile()) AS.setVolatile();
 }
 
 void AliasSetTracker::add(StoreInst *SI) {
-  addPointer(SI->getOperand(1),
-             AA.getTargetData().getTypeSize(SI->getOperand(0)->getType()),
-             AliasSet::Mods);
+  AliasSet &AS = 
+    addPointer(SI->getOperand(1),
+               AA.getTargetData().getTypeSize(SI->getOperand(0)->getType()),
+               AliasSet::Mods);
+  if (SI->isVolatile()) AS.setVolatile();
 }
 
+
 void AliasSetTracker::add(CallSite CS) {
   AliasSet *AS = findAliasSetForCallSite(CS);
   if (!AS) {
@@ -263,6 +267,7 @@ void AliasSet::print(std::ostream &OS) const {
   case ModRef  : OS << "Mod/Ref   "; break;
   default: assert(0 && "Bad value for AccessTy!");
   }
+  if (isVolatile()) OS << "[volatile] ";
   if (Forward)
     OS << " forwarding to " << (void*)Forward;
 
@@ -329,5 +334,3 @@ namespace {
   RegisterPass<AliasSetPrinter> X("print-alias-sets", "Alias Set Printer",
                                   PassInfo::Analysis | PassInfo::Optimization);
 }
-
-} // End llvm namespace