IRGen: Offset::offsetBy() should take an Offset and a Size

Author: slavapestov

lib/IRGen/IRGen.h

@@ -484,7 +484,7 @@ class Offset {
   }
 
   llvm::Value *getAsValue(IRGenFunction &IGF) const;
-  Offset offsetBy(IRGenFunction &IGF, Offset other) const;
+  Offset offsetBy(IRGenFunction &IGF, Size other) const;
 };
 
 } // end namespace irgen

lib/IRGen/IRGenFunction.cpp

@@ -394,11 +394,12 @@ llvm::Value *Offset::getAsValue(IRGenFunction &IGF) const {
   }
 }
 
-Offset Offset::offsetBy(IRGenFunction &IGF, Offset other) const {
-  if (isStatic() && other.isStatic()) {
-    return Offset(getStatic() + other.getStatic());
+Offset Offset::offsetBy(IRGenFunction &IGF, Size other) const {
+  if (isStatic()) {
+    return Offset(getStatic() + other);
   }
-  return Offset(IGF.Builder.CreateAdd(getDynamic(), other.getDynamic()));
+  auto otherVal = llvm::ConstantInt::get(IGF.IGM.SizeTy, other.getValue());
+  return Offset(IGF.Builder.CreateAdd(getDynamic(), otherVal));
 }
 
 Address IRGenFunction::emitAddressAtOffset(llvm::Value *base, Offset offset,

lib/IRGen/MetadataLayout.cpp

@@ -147,7 +147,7 @@ static llvm::Value *emitLoadOfGenericRequirement(IRGenFunction &IGF,
                                                  llvm::Type *reqtTy) {
   auto offset =
     IGF.IGM.getMetadataLayout(decl).getGenericRequirementsOffset(IGF);
-  offset = offset.offsetBy(IGF, Offset(reqtIndex * IGF.IGM.getPointerSize()));
+  offset = offset.offsetBy(IGF, Size(reqtIndex * IGF.IGM.getPointerSize()));
 
   auto slot = IGF.emitAddressAtOffset(metadata, offset, reqtTy,
                                       IGF.IGM.getPointerAlignment());