Rename hasNoUnsignedOverflow and hasNoSignedOverflow to hasNoUnsignedWrap

and hasNoSignedWrap, for consistency with the nuw and nsw properties.

llvm-svn: 79539

llvm/include/llvm/Analysis/ScalarEvolutionExpressions.h

@@ -426,12 +426,12 @@ namespace llvm {
       return cast<SCEVAddRecExpr>(SE.getAddExpr(this, getStepRecurrence(SE)));
     }
 
-    bool hasNoUnsignedOverflow() const { return SubclassData & (1 << 0); }
+    bool hasNoUnsignedWrap() const { return SubclassData & (1 << 0); }
-    void setHasNoUnsignedOverflow(bool B) {
+    void setHasNoUnsignedWrap(bool B) {
       SubclassData = (SubclassData & ~(1 << 0)) | (B << 0);
     }
-    bool hasNoSignedOverflow() const { return SubclassData & (1 << 1); }
+    bool hasNoSignedWrap() const { return SubclassData & (1 << 1); }
-    void setHasNoSignedOverflow(bool B) {
+    void setHasNoSignedWrap(bool B) {
       SubclassData = (SubclassData & ~(1 << 1)) | (B << 1);
     }
 

llvm/include/llvm/Bitcode/LLVMBitCodes.h

@@ -180,8 +180,8 @@ namespace bitc {
   /// OverflowingBinaryOperatorOptionalFlags - Flags for serializing
   /// OverflowingBinaryOperator's SubclassOptionalData contents.
   enum OverflowingBinaryOperatorOptionalFlags {
-    OBO_NO_UNSIGNED_OVERFLOW = 0,
+    OBO_NO_UNSIGNED_WRAP = 0,
-    OBO_NO_SIGNED_OVERFLOW = 1
+    OBO_NO_SIGNED_WRAP = 1
   };
 
   /// SDivOperatorOptionalFlags - Flags for serializing SDivOperator's

llvm/include/llvm/InstrTypes.h

@@ -201,19 +201,19 @@ public:
   static BinaryOperator *CreateNSWAdd(Value *V1, Value *V2,
                                       const Twine &Name = "") {
     BinaryOperator *BO = CreateAdd(V1, V2, Name);
-    cast<AddOperator>(BO)->setHasNoSignedOverflow(true);
+    cast<AddOperator>(BO)->setHasNoSignedWrap(true);
     return BO;
   }
   static BinaryOperator *CreateNSWAdd(Value *V1, Value *V2,
                                       const Twine &Name, BasicBlock *BB) {
     BinaryOperator *BO = CreateAdd(V1, V2, Name, BB);
-    cast<AddOperator>(BO)->setHasNoSignedOverflow(true);
+    cast<AddOperator>(BO)->setHasNoSignedWrap(true);
     return BO;
   }
   static BinaryOperator *CreateNSWAdd(Value *V1, Value *V2,
                                       const Twine &Name, Instruction *I) {
     BinaryOperator *BO = CreateAdd(V1, V2, Name, I);
-    cast<AddOperator>(BO)->setHasNoSignedOverflow(true);
+    cast<AddOperator>(BO)->setHasNoSignedWrap(true);
     return BO;
   }
 

llvm/include/llvm/Operator.h

@@ -69,21 +69,21 @@ public:
 class OverflowingBinaryOperator : public Operator {
   ~OverflowingBinaryOperator(); // do not implement
 public:
-  /// hasNoUnsignedOverflow - Test whether this operation is known to never
+  /// hasNoUnsignedWrap - Test whether this operation is known to never
-  /// undergo unsigned overflow.
+  /// undergo unsigned overflow, aka the nuw property.
-  bool hasNoUnsignedOverflow() const {
+  bool hasNoUnsignedWrap() const {
     return SubclassOptionalData & (1 << 0);
   }
-  void setHasNoUnsignedOverflow(bool B) {
+  void setHasNoUnsignedWrap(bool B) {
     SubclassOptionalData = (SubclassOptionalData & ~(1 << 0)) | (B << 0);
   }
 
-  /// hasNoSignedOverflow - Test whether this operation is known to never
+  /// hasNoSignedWrap - Test whether this operation is known to never
-  /// undergo signed overflow.
+  /// undergo signed overflow, aka the nsw property.
-  bool hasNoSignedOverflow() const {
+  bool hasNoSignedWrap() const {
     return SubclassOptionalData & (1 << 1);
   }
-  void setHasNoSignedOverflow(bool B) {
+  void setHasNoSignedWrap(bool B) {
     SubclassOptionalData = (SubclassOptionalData & ~(1 << 1)) | (B << 1);
   }
 

llvm/lib/Analysis/ScalarEvolution.cpp

@@ -795,7 +795,7 @@ const SCEV *ScalarEvolution::getZeroExtendExpr(const SCEV *Op,
 
       // If we have special knowledge that this addrec won't overflow,
       // we don't need to do any further analysis.
-      if (AR->hasNoUnsignedOverflow())
+      if (AR->hasNoUnsignedWrap())
         return getAddRecExpr(getZeroExtendExpr(Start, Ty),
                              getZeroExtendExpr(Step, Ty),
                              L);
@@ -934,7 +934,7 @@ const SCEV *ScalarEvolution::getSignExtendExpr(const SCEV *Op,
 
       // If we have special knowledge that this addrec won't overflow,
       // we don't need to do any further analysis.
-      if (AR->hasNoSignedOverflow())
+      if (AR->hasNoSignedWrap())
         return getAddRecExpr(getSignExtendExpr(Start, Ty),
                              getSignExtendExpr(Step, Ty),
                              L);
@@ -2497,17 +2497,17 @@ const SCEV *ScalarEvolution::createNodeForPHI(PHINode *PN) {
                     getSCEV(OBO->getOperand(1)) ==
                       PHISCEV->getStepRecurrence(*this)) {
                   const SCEVAddRecExpr *PostInc = PHISCEV->getPostIncExpr(*this);
-                  if (OBO->hasNoUnsignedOverflow()) {
+                  if (OBO->hasNoUnsignedWrap()) {
                     const_cast<SCEVAddRecExpr *>(PHISCEV)
-                      ->setHasNoUnsignedOverflow(true);
+                      ->setHasNoUnsignedWrap(true);
                     const_cast<SCEVAddRecExpr *>(PostInc)
-                      ->setHasNoUnsignedOverflow(true);
+                      ->setHasNoUnsignedWrap(true);
                   }
-                  if (OBO->hasNoSignedOverflow()) {
+                  if (OBO->hasNoSignedWrap()) {
                     const_cast<SCEVAddRecExpr *>(PHISCEV)
-                      ->setHasNoSignedOverflow(true);
+                      ->setHasNoSignedWrap(true);
                     const_cast<SCEVAddRecExpr *>(PostInc)
-                      ->setHasNoSignedOverflow(true);
+                      ->setHasNoSignedWrap(true);
                   }
                 }
 

llvm/lib/AsmParser/LLParser.cpp

@@ -2082,9 +2082,9 @@ bool LLParser::ParseValID(ValID &ID) {
       return Error(ID.Loc,"constexpr requires integer, fp, or vector operands");
     Constant *C = ConstantExpr::get(Opc, Val0, Val1);
     if (NUW)
-      cast<OverflowingBinaryOperator>(C)->setHasNoUnsignedOverflow(true);
+      cast<OverflowingBinaryOperator>(C)->setHasNoUnsignedWrap(true);
     if (NSW)
-      cast<OverflowingBinaryOperator>(C)->setHasNoSignedOverflow(true);
+      cast<OverflowingBinaryOperator>(C)->setHasNoSignedWrap(true);
     if (Exact)
       cast<SDivOperator>(C)->setIsExact(true);
     ID.ConstantVal = C;
@@ -2665,9 +2665,9 @@ bool LLParser::ParseInstruction(Instruction *&Inst, BasicBlock *BB,
           return Error(ModifierLoc, "nsw only applies to integer operations");
       }
       if (NUW)
-        cast<OverflowingBinaryOperator>(Inst)->setHasNoUnsignedOverflow(true);
+        cast<OverflowingBinaryOperator>(Inst)->setHasNoUnsignedWrap(true);
       if (NSW)
-        cast<OverflowingBinaryOperator>(Inst)->setHasNoSignedOverflow(true);
+        cast<OverflowingBinaryOperator>(Inst)->setHasNoSignedWrap(true);
     }
     return Result;
   }

llvm/lib/Bitcode/Reader/BitcodeReader.cpp

@@ -883,10 +883,10 @@ bool BitcodeReader::ResolveGlobalAndAliasInits() {
 static void SetOptimizationFlags(Value *V, uint64_t Flags) {
   if (OverflowingBinaryOperator *OBO =
         dyn_cast<OverflowingBinaryOperator>(V)) {
-    if (Flags & (1 << bitc::OBO_NO_SIGNED_OVERFLOW))
+    if (Flags & (1 << bitc::OBO_NO_SIGNED_WRAP))
-      OBO->setHasNoSignedOverflow(true);
+      OBO->setHasNoSignedWrap(true);
-    if (Flags & (1 << bitc::OBO_NO_UNSIGNED_OVERFLOW))
+    if (Flags & (1 << bitc::OBO_NO_UNSIGNED_WRAP))
-      OBO->setHasNoUnsignedOverflow(true);
+      OBO->setHasNoUnsignedWrap(true);
   } else if (SDivOperator *Div = dyn_cast<SDivOperator>(V)) {
     if (Flags & (1 << bitc::SDIV_EXACT))
       Div->setIsExact(true);

llvm/lib/Bitcode/Writer/BitcodeWriter.cpp

@@ -461,10 +461,10 @@ static uint64_t GetOptimizationFlags(const Value *V) {
 
   if (const OverflowingBinaryOperator *OBO =
         dyn_cast<OverflowingBinaryOperator>(V)) {
-    if (OBO->hasNoSignedOverflow())
+    if (OBO->hasNoSignedWrap())
-      Flags |= 1 << bitc::OBO_NO_SIGNED_OVERFLOW;
+      Flags |= 1 << bitc::OBO_NO_SIGNED_WRAP;
-    if (OBO->hasNoUnsignedOverflow())
+    if (OBO->hasNoUnsignedWrap())
-      Flags |= 1 << bitc::OBO_NO_UNSIGNED_OVERFLOW;
+      Flags |= 1 << bitc::OBO_NO_UNSIGNED_WRAP;
   } else if (const SDivOperator *Div = dyn_cast<SDivOperator>(V)) {
     if (Div->isExact())
       Flags |= 1 << bitc::SDIV_EXACT;

llvm/lib/Transforms/Scalar/InstructionCombining.cpp

@@ -3084,7 +3084,7 @@ Instruction *InstCombiner::visitSDiv(BinaryOperator &I) {
     if (SubOperator *Sub = dyn_cast<SubOperator>(Op0))
       if (isa<Constant>(Sub->getOperand(0)) &&
           cast<Constant>(Sub->getOperand(0))->isNullValue() &&
-          Sub->hasNoSignedOverflow())
+          Sub->hasNoSignedWrap())
         return BinaryOperator::CreateSDiv(Sub->getOperand(1),
                                           ConstantExpr::getNeg(RHS));
   }

llvm/lib/VMCore/AsmWriter.cpp

@@ -895,9 +895,9 @@ static void WriteMDNodes(formatted_raw_ostream &Out, TypePrinting &TypePrinter,
 static void WriteOptimizationInfo(raw_ostream &Out, const User *U) {
   if (const OverflowingBinaryOperator *OBO =
         dyn_cast<OverflowingBinaryOperator>(U)) {
-    if (OBO->hasNoUnsignedOverflow())
+    if (OBO->hasNoUnsignedWrap())
       Out << " nuw";
-    if (OBO->hasNoSignedOverflow())
+    if (OBO->hasNoSignedWrap())
       Out << " nsw";
   } else if (const SDivOperator *Div = dyn_cast<SDivOperator>(U)) {
     if (Div->isExact())

llvm/lib/VMCore/Constants.cpp

@@ -634,7 +634,7 @@ Constant* ConstantExpr::getNSWAdd(Constant* C1, Constant* C2) {
   // Set nsw attribute, assuming constant folding didn't eliminate the
   // Add.
   if (AddOperator *Add = dyn_cast<AddOperator>(C))
-    Add->setHasNoSignedOverflow(true);
+    Add->setHasNoSignedWrap(true);
   return C;
 }