[llvm] e8dc6e9 - [MemLoc] Use hasValue() method more (NFC)

[Nikita Popov via llvm-commits]

Author: Nikita Popov
Date: 2020-11-19T22:29:44+01:00
New Revision: e8dc6e9a3242a5c07eb614d0d0de9a1dab6385b1

URL: https://github.com/llvm/llvm-project/commit/e8dc6e9a3242a5c07eb614d0d0de9a1dab6385b1
DIFF: https://github.com/llvm/llvm-project/commit/e8dc6e9a3242a5c07eb614d0d0de9a1dab6385b1.diff

LOG: [MemLoc] Use hasValue() method more (NFC)

Followup to 7de7c40898a8f815d661781c92757f93fa4c6e5b. I previously
removed a number of == comparisons to LocationSize::unknown(), but
missed these != comparisons.

Added: 
    

Modified: 
    llvm/lib/Analysis/BasicAliasAnalysis.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Analysis/BasicAliasAnalysis.cpp b/llvm/lib/Analysis/BasicAliasAnalysis.cpp
index b73e1cfe56e0a..944ff8e9917b5 100644
--- a/llvm/lib/Analysis/BasicAliasAnalysis.cpp
+++ b/llvm/lib/Analysis/BasicAliasAnalysis.cpp
@@ -1333,7 +1333,7 @@ AliasResult BasicAAResult::aliasGEP(
   // greater, we know they do not overlap.
   if (GEP1BaseOffset != 0 && DecompGEP1.VarIndices.empty()) {
     if (GEP1BaseOffset.sge(0)) {
-      if (V2Size != LocationSize::unknown()) {
+      if (V2Size.hasValue()) {
         if (GEP1BaseOffset.ult(V2Size.getValue()))
           return PartialAlias;
         return NoAlias;
@@ -1347,8 +1347,7 @@ AliasResult BasicAAResult::aliasGEP(
       // GEP1             V2
       // We need to know that V2Size is not unknown, otherwise we might have
       // stripped a gep with negative index ('gep <ptr>, -1, ...).
-      if (V1Size != LocationSize::unknown() &&
-          V2Size != LocationSize::unknown()) {
+      if (V1Size.hasValue() && V2Size.hasValue()) {
         if ((-GEP1BaseOffset).ult(V1Size.getValue()))
           return PartialAlias;
         return NoAlias;
@@ -1400,8 +1399,8 @@ AliasResult BasicAAResult::aliasGEP(
     APInt ModOffset = GEP1BaseOffset.srem(GCD);
     if (ModOffset.isNegative())
       ModOffset += GCD; // We want mod, not rem.
-    if (V1Size != LocationSize::unknown() &&
-        V2Size != LocationSize::unknown() && ModOffset.uge(V2Size.getValue()) &&
+    if (V1Size.hasValue() && V2Size.hasValue() &&
+        ModOffset.uge(V2Size.getValue()) &&
         (GCD - ModOffset).uge(V1Size.getValue()))
       return NoAlias;
 
@@ -1409,14 +1408,14 @@ AliasResult BasicAAResult::aliasGEP(
     // also non-negative and >= GEP1BaseOffset. We have the following layout:
     // [0, V2Size) ... [TotalOffset, TotalOffer+V1Size]
     // If GEP1BaseOffset >= V2Size, the accesses don't alias.
-    if (AllNonNegative && V2Size != LocationSize::unknown() &&
+    if (AllNonNegative && V2Size.hasValue() &&
         GEP1BaseOffset.uge(V2Size.getValue()))
       return NoAlias;
     // Similarly, if the variables are non-positive, then the total offset is
     // also non-positive and <= GEP1BaseOffset. We have the following layout:
     // [TotalOffset, TotalOffset+V1Size) ... [0, V2Size)
     // If -GEP1BaseOffset >= V1Size, the accesses don't alias.
-    if (AllNonPositive && V1Size != LocationSize::unknown() &&
+    if (AllNonPositive && V1Size.hasValue() &&
         (-GEP1BaseOffset).uge(V1Size.getValue()))
       return NoAlias;