IRGen: Factor out IRBuilder helpers for CreateLifetimeStart/End.

Author: jckarter

lib/IRGen/GenInit.cpp

@@ -62,8 +62,7 @@ ContainedAddress FixedTypeInfo::allocateStack(IRGenFunction &IGF, SILType T,
 
   Address alloca =
     IGF.createAlloca(getStorageType(), getFixedAlignment(), name);
-  IGF.Builder.CreateLifetimeStart(alloca.getAddress(),
-            llvm::ConstantInt::get(IGF.IGM.Int64Ty, getFixedSize().getValue()));
+  IGF.Builder.CreateLifetimeStart(alloca, getFixedSize());
 
   return { alloca, alloca };
 }
@@ -72,6 +71,5 @@ void FixedTypeInfo::deallocateStack(IRGenFunction &IGF, Address addr,
                                     SILType T) const {
   if (isKnownEmpty())
     return;
-  IGF.Builder.CreateLifetimeEnd(addr.getAddress(),
-            llvm::ConstantInt::get(IGF.IGM.Int64Ty, getFixedSize().getValue()));
+  IGF.Builder.CreateLifetimeEnd(addr, getFixedSize());
 }

lib/IRGen/IRBuilder.h

@@ -211,6 +211,18 @@ class IRBuilder : public IRBuilderBase {
                         std::min(dest.getAlignment(),
                                  src.getAlignment()).getValue());
   }
+  
+  using IRBuilderBase::CreateLifetimeStart;
+  llvm::CallInst *CreateLifetimeStart(Address buf, Size size) {
+    return CreateLifetimeStart(buf.getAddress(),
+                   llvm::ConstantInt::get(Context, APInt(64, size.getValue())));
+  }
+  
+  using IRBuilderBase::CreateLifetimeEnd;
+  llvm::CallInst *CreateLifetimeEnd(Address buf, Size size) {
+    return CreateLifetimeEnd(buf.getAddress(),
+                   llvm::ConstantInt::get(Context, APInt(64, size.getValue())));
+  }
 };
 
 } // end namespace irgen

lib/IRGen/IRGenSIL.cpp

@@ -3271,9 +3271,8 @@ static bool tryDeferFixedSizeBufferInitialization(IRGenSILFunction &IGF,
     // now, but don't allocate the value inside it.
     if (!fixedSizeBuffer.getAddress()) {
       fixedSizeBuffer = IGF.createFixedSizeBufferAlloca(name);
-      IGF.Builder.CreateLifetimeStart(fixedSizeBuffer.getAddress(),
-                llvm::ConstantInt::get(IGF.IGM.Int64Ty,
-                                       getFixedBufferSize(IGF.IGM).getValue()));
+      IGF.Builder.CreateLifetimeStart(fixedSizeBuffer,
+                                      getFixedBufferSize(IGF.IGM));
     }
     if (containerValue)
       IGF.setLoweredAddress(containerValue, fixedSizeBuffer);

lib/IRGen/NonFixedTypeInfo.h

@@ -62,9 +62,7 @@ class WitnessSizedTypeInfo : public IndirectTypeInfo<Impl, TypeInfo> {
                                  const llvm::Twine &name) const override {
     // Make a fixed-size buffer.
     Address buffer = IGF.createFixedSizeBufferAlloca(name);
-    IGF.Builder.CreateLifetimeStart(buffer.getAddress(),
-                llvm::ConstantInt::get(IGF.IGM.Int64Ty,
-                                       getFixedBufferSize(IGF.IGM).getValue()));
+    IGF.Builder.CreateLifetimeStart(buffer, getFixedBufferSize(IGF.IGM));
 
     // Allocate an object of the appropriate type within it.
     llvm::Value *address = emitAllocateBufferCall(IGF, T, buffer);
@@ -74,9 +72,7 @@ class WitnessSizedTypeInfo : public IndirectTypeInfo<Impl, TypeInfo> {
   void deallocateStack(IRGenFunction &IGF, Address buffer,
                        SILType T) const override {
     emitDeallocateBufferCall(IGF, T, buffer);
-    IGF.Builder.CreateLifetimeEnd(buffer.getAddress(),
-                llvm::ConstantInt::get(IGF.IGM.Int64Ty,
-                                       getFixedBufferSize(IGF.IGM).getValue()));
+    IGF.Builder.CreateLifetimeEnd(buffer, getFixedBufferSize(IGF.IGM));
   }
 
   llvm::Value *getValueWitnessTable(IRGenFunction &IGF, SILType T) const {