Use range for path iterators

Author: andykaylor

clang/lib/CIR/CodeGen/CIRGenClass.cpp

@@ -18,17 +18,13 @@
 using namespace clang;
 using namespace clang::CIRGen;
 
-Address
-CIRGenFunction::getAddressOfBaseClass(Address value,
-                                      const CXXRecordDecl *derived,
-                                      CastExpr::path_const_iterator pathBegin,
-                                      CastExpr::path_const_iterator pathEnd,
-                                      bool nullCheckValue, SourceLocation loc) {
-  assert(pathBegin != pathEnd && "Base path should not be empty!");
+Address CIRGenFunction::getAddressOfBaseClass(
+    Address value, const CXXRecordDecl *derived,
+    llvm::iterator_range<CastExpr::path_const_iterator> path,
+    bool nullCheckValue, SourceLocation loc) {
+  assert(!path.empty() && "Base path should not be empty!");
 
-  CastExpr::path_const_iterator start = pathBegin;
-
-  if ((*start)->isVirtual()) {
+  if ((*path.begin())->isVirtual()) {
     // The implementation here is actually complete, but let's flag this
     // as an error until the rest of the virtual base class support is in place.
     cgm.errorNYI(loc, "getAddrOfBaseClass: virtual base");
@@ -39,10 +35,10 @@ CIRGenFunction::getAddressOfBaseClass(Address value,
   // allocating subobject (the virtual base, if there is one, or else
   // the "complete" object that we see).
   CharUnits nonVirtualOffset =
-      cgm.computeNonVirtualBaseClassOffset(derived, start, pathEnd);
+      cgm.computeNonVirtualBaseClassOffset(derived, path);
 
   // Get the base pointer type.
-  mlir::Type baseValueTy = convertType((pathEnd[-1])->getType());
+  mlir::Type baseValueTy = convertType((path.end()[-1])->getType());
   assert(!cir::MissingFeatures::addressSpace());
 
   // The if statement here is redundant now, but it will be needed when we add

clang/lib/CIR/CodeGen/CIRGenExpr.cpp

@@ -102,9 +102,9 @@ Address CIRGenFunction::emitPointerWithAlignment(const Expr *expr,
       Address addr = emitPointerWithAlignment(ce->getSubExpr(), baseInfo);
       const CXXRecordDecl *derived =
           ce->getSubExpr()->getType()->getPointeeCXXRecordDecl();
-      return getAddressOfBaseClass(
-          addr, derived, ce->path_begin(), ce->path_end(),
-          shouldNullCheckClassCastValue(ce), ce->getExprLoc());
+      return getAddressOfBaseClass(addr, derived, ce->path(),
+                                   shouldNullCheckClassCastValue(ce),
+                                   ce->getExprLoc());
     }
 
     case CK_AnyPointerToBlockPointerCast:
@@ -876,9 +876,9 @@ LValue CIRGenFunction::emitCastLValue(const CastExpr *e) {
     Address thisAddr = lv.getAddress();
 
     // Perform the derived-to-base conversion
-    Address baseAddr = getAddressOfBaseClass(
-        thisAddr, derivedClassDecl, e->path_begin(), e->path_end(),
-        /*NullCheckValue=*/false, e->getExprLoc());
+    Address baseAddr =
+        getAddressOfBaseClass(thisAddr, derivedClassDecl, e->path(),
+                              /*NullCheckValue=*/false, e->getExprLoc());
 
     // TODO: Support accesses to members of base classes in TBAA. For now, we
     // conservatively pretend that the complete object is of the base class

clang/lib/CIR/CodeGen/CIRGenFunction.h

@@ -447,10 +447,10 @@ class CIRGenFunction : public CIRGenTypeCache {
     return Address(ptr, convertTypeForMem(t), alignment);
   }
 
-  Address getAddressOfBaseClass(Address value, const CXXRecordDecl *derived,
-                                CastExpr::path_const_iterator pathBegin,
-                                CastExpr::path_const_iterator pathEnd,
-                                bool nullCheckValue, SourceLocation loc);
+  Address getAddressOfBaseClass(
+      Address value, const CXXRecordDecl *derived,
+      llvm::iterator_range<CastExpr::path_const_iterator> path,
+      bool nullCheckValue, SourceLocation loc);
 
   LValue makeAddrLValue(Address addr, QualType ty,
                         AlignmentSource source = AlignmentSource::Type) {

clang/lib/CIR/CodeGen/CIRGenModule.cpp

@@ -1680,15 +1680,14 @@ bool CIRGenModule::verifyModule() const {
 
 // TODO(cir): this can be shared with LLVM codegen.
 CharUnits CIRGenModule::computeNonVirtualBaseClassOffset(
-    const CXXRecordDecl *derivedClass, CastExpr::path_const_iterator start,
-    CastExpr::path_const_iterator end) {
+    const CXXRecordDecl *derivedClass,
+    llvm::iterator_range<CastExpr::path_const_iterator> path) {
   CharUnits offset = CharUnits::Zero();
 
   const ASTContext &astContext = getASTContext();
   const CXXRecordDecl *rd = derivedClass;
 
-  for (CastExpr::path_const_iterator i = start; i != end; ++i) {
-    const CXXBaseSpecifier *base = *i;
+  for (const CXXBaseSpecifier *base : path) {
     assert(!base->isVirtual() && "Should not see virtual bases here!");
 
     // Get the layout.

clang/lib/CIR/CodeGen/CIRGenModule.h

@@ -141,10 +141,9 @@ class CIRGenModule : public CIRGenTypeCache {
   getAddrOfGlobalVar(const VarDecl *d, mlir::Type ty = {},
                      ForDefinition_t isForDefinition = NotForDefinition);
 
-  CharUnits
-  computeNonVirtualBaseClassOffset(const CXXRecordDecl *derivedClass,
-                                   CastExpr::path_const_iterator start,
-                                   CastExpr::path_const_iterator end);
+  CharUnits computeNonVirtualBaseClassOffset(
+      const CXXRecordDecl *derivedClass,
+      llvm::iterator_range<CastExpr::path_const_iterator> path);
 
   /// Return a constant array for the given string.
   mlir::Attribute getConstantArrayFromStringLiteral(const StringLiteral *e);