simplify hasWrappingOperand with QualType additions

Signed-off-by: Justin Stitt <[email protected]>

Author: JustinStitt

clang/include/clang/AST/Type.h

@@ -1239,6 +1239,8 @@ class QualType {
     return getQualifiers().hasStrongOrWeakObjCLifetime();
   }
 
+  bool hasWrapsAttr() const;
+
   // true when Type is objc's weak and weak is enabled but ARC isn't.
   bool isNonWeakInMRRWithObjCWeak(const ASTContext &Context) const;
 

clang/lib/AST/Expr.cpp

@@ -2238,18 +2238,8 @@ bool BinaryOperator::isNullPointerArithmeticExtension(ASTContext &Ctx,
 }
 
 bool BinaryOperator::hasWrappingOperand(const ASTContext &Ctx) const {
-  llvm::SmallVector<Expr *, 2> Both = {getLHS(), getRHS()};
-
-  for (const Expr *oneOf : Both) {
-    if (!oneOf)
-      continue;
-    if (auto *TypePtr =
-            oneOf->IgnoreParenImpCasts()->getType().getTypePtrOrNull())
-      if (TypePtr->hasAttr(attr::Wraps)) {
-        return true;
-      }
-  }
-  return false;
+  return getLHS()->getType().hasWrapsAttr() ||
+         getRHS()->getType().hasWrapsAttr();
 }
 
 SourceLocExpr::SourceLocExpr(const ASTContext &Ctx, SourceLocIdentKind Kind,

clang/lib/AST/Type.cpp

@@ -2807,6 +2807,10 @@ bool QualType::isTriviallyEqualityComparableType(
       CanonicalType, /*CheckIfTriviallyCopyable=*/false);
 }
 
+bool QualType::hasWrapsAttr() const {
+  return !isNull() && getTypePtr()->hasAttr(attr::Wraps);
+}
+
 bool QualType::isNonWeakInMRRWithObjCWeak(const ASTContext &Context) const {
   return !Context.getLangOpts().ObjCAutoRefCount &&
          Context.getLangOpts().ObjCWeak &&

clang/lib/CodeGen/CGExprScalar.cpp

@@ -160,10 +160,7 @@ struct BinOpInfo {
   /// Does the BinaryOperator have the wraps attribute?
   /// If so, we can ellide overflow sanitizer checks.
   bool hasWrappingOperand() const {
-    const Type *TyPtr = E->getType().getTypePtrOrNull();
-    if (TyPtr)
-      return TyPtr->hasAttr(attr::Wraps);
-    return false;
+    return E->getType().hasWrapsAttr();
   }
 };