[NFC] Give IRGenModule Exclusive Ownership of an LLVMContext Object

CodaFi · CodaFi · commit 40d9cd8d3f62 · 2020-04-16T11:57:44.000-07:00
diff --git a/lib/IRGen/GenArchetype.cpp b/lib/IRGen/GenArchetype.cpp
@@ -435,7 +435,7 @@ withOpaqueTypeGenericArgs(IRGenFunction &IGF,
           }
           types.push_back(args.back()->getType());
         });
-    auto bufTy = llvm::StructType::get(IGF.IGM.LLVMContext, types);
+    auto bufTy = llvm::StructType::get(IGF.IGM.getLLVMContext(), types);
     alloca = IGF.createAlloca(bufTy, IGF.IGM.getPointerAlignment());
     allocaSize = IGF.IGM.getPointerSize() * args.size();
     IGF.Builder.CreateLifetimeStart(alloca, allocaSize);
diff --git a/lib/IRGen/GenBuiltin.cpp b/lib/IRGen/GenBuiltin.cpp
@@ -657,7 +657,7 @@ if (Builtin.ID == BuiltinValueKind::id) { \
     // If the type is floating-point, then we need to bitcast to integer.
     auto valueTy = origValueTy;
     if (valueTy->isFloatingPointTy()) {
-      valueTy = llvm::IntegerType::get(IGF.IGM.LLVMContext,
+      valueTy = llvm::IntegerType::get(IGF.IGM.getLLVMContext(),
                                        valueTy->getPrimitiveSizeInBits());
     }
 
diff --git a/lib/IRGen/GenCall.cpp b/lib/IRGen/GenCall.cpp
@@ -100,7 +100,7 @@ static void addDereferenceableAttributeToBuilder(IRGenModule &IGM,
   // dynamic-layout aggregates.
   if (auto fixedTI = dyn_cast<FixedTypeInfo>(&ti)) {
     b.addAttribute(
-      llvm::Attribute::getWithDereferenceableBytes(IGM.LLVMContext,
+      llvm::Attribute::getWithDereferenceableBytes(IGM.getLLVMContext(),
                                          fixedTI->getFixedSize().getValue()));
   }
 }
@@ -116,7 +116,7 @@ static void addIndirectValueParameterAttributes(IRGenModule &IGM,
   // The parameter must reference dereferenceable memory of the type.
   addDereferenceableAttributeToBuilder(IGM, b, ti);
 
-  attrs = attrs.addAttributes(IGM.LLVMContext,
+  attrs = attrs.addAttributes(IGM.getLLVMContext(),
                               argIndex + llvm::AttributeList::FirstArgIndex, b);
 }
 
@@ -132,7 +132,7 @@ static void addInoutParameterAttributes(IRGenModule &IGM,
   // The inout must reference dereferenceable memory of the type.
   addDereferenceableAttributeToBuilder(IGM, b, ti);
 
-  attrs = attrs.addAttributes(IGM.LLVMContext,
+  attrs = attrs.addAttributes(IGM.getLLVMContext(),
                               argIndex + llvm::AttributeList::FirstArgIndex, b);
 }
 
@@ -169,7 +169,7 @@ static void addIndirectResultAttributes(IRGenModule &IGM,
   b.addAttribute(llvm::Attribute::NoCapture);
   if (allowSRet)
     b.addAttribute(llvm::Attribute::StructRet);
-  attrs = attrs.addAttributes(IGM.LLVMContext,
+  attrs = attrs.addAttributes(IGM.getLLVMContext(),
                               paramIndex + llvm::AttributeList::FirstArgIndex,
                               b);
 }
@@ -178,7 +178,7 @@ void IRGenModule::addSwiftSelfAttributes(llvm::AttributeList &attrs,
                                          unsigned argIndex) {
   llvm::AttrBuilder b;
   b.addAttribute(llvm::Attribute::SwiftSelf);
-  attrs = attrs.addAttributes(this->LLVMContext,
+  attrs = attrs.addAttributes(this->getLLVMContext(),
                               argIndex + llvm::AttributeList::FirstArgIndex, b);
 }
 
@@ -199,7 +199,7 @@ void IRGenModule::addSwiftErrorAttributes(llvm::AttributeList &attrs,
   b.addDereferenceableAttr(getPointerSize().getValue());
   
   auto attrIndex = argIndex + llvm::AttributeList::FirstArgIndex;
-  attrs = attrs.addAttributes(this->LLVMContext, attrIndex, b);
+  attrs = attrs.addAttributes(this->getLLVMContext(), attrIndex, b);
 }
 
 void irgen::addByvalArgumentAttributes(IRGenModule &IGM,
@@ -208,8 +208,8 @@ void irgen::addByvalArgumentAttributes(IRGenModule &IGM,
   llvm::AttrBuilder b;
   b.addAttribute(llvm::Attribute::ByVal);
   b.addAttribute(llvm::Attribute::getWithAlignment(
-      IGM.LLVMContext, llvm::Align(align.getValue())));
-  attrs = attrs.addAttributes(IGM.LLVMContext,
+      IGM.getLLVMContext(), llvm::Align(align.getValue())));
+  attrs = attrs.addAttributes(IGM.getLLVMContext(),
                               argIndex + llvm::AttributeList::FirstArgIndex, b);
 }
 
@@ -220,7 +220,7 @@ void irgen::addExtendAttribute(IRGenModule &IGM, llvm::AttributeList &attrs,
     b.addAttribute(llvm::Attribute::SExt);
   else
     b.addAttribute(llvm::Attribute::ZExt);
-  attrs = attrs.addAttributes(IGM.LLVMContext, index, b);
+  attrs = attrs.addAttributes(IGM.getLLVMContext(), index, b);
 }
 
 namespace swift {
@@ -2841,7 +2841,7 @@ void CallEmission::setArgs(Explosion &original, bool isOutlined,
 void CallEmission::addAttribute(unsigned index,
                                 llvm::Attribute::AttrKind attr) {
   auto &attrs = CurCallee.getMutableAttributes();
-  attrs = attrs.addAttribute(IGF.IGM.LLVMContext, index, attr);
+  attrs = attrs.addAttribute(IGF.IGM.getLLVMContext(), index, attr);
 }
 
 /// Initialize an Explosion with the parameters of the current
diff --git a/lib/IRGen/GenConstant.cpp b/lib/IRGen/GenConstant.cpp
@@ -53,11 +53,11 @@ llvm::Constant *irgen::emitConstantInt(IRGenModule &IGM,
     assert(width.isFixedWidth() && "impossible width value");
   }
 
-  return llvm::ConstantInt::get(IGM.LLVMContext, value);
+  return llvm::ConstantInt::get(IGM.getLLVMContext(), value);
 }
 
 llvm::Constant *irgen::emitConstantFP(IRGenModule &IGM, FloatLiteralInst *FLI) {
-  return llvm::ConstantFP::get(IGM.LLVMContext, FLI->getValue());
+  return llvm::ConstantFP::get(IGM.getLLVMContext(), FLI->getValue());
 }
 
 llvm::Constant *irgen::emitAddrOfConstantString(IRGenModule &IGM,
diff --git a/lib/IRGen/GenCoverage.cpp b/lib/IRGen/GenCoverage.cpp
@@ -80,7 +80,7 @@ void IRGenModule::emitCoverageMapping() {
   size_t CurrentSize, PrevSize = FilenamesSize;
 
   // Now we need to build up the list of function records.
-  llvm::LLVMContext &Ctx = LLVMContext;
+  llvm::LLVMContext &Ctx = getLLVMContext();
   auto *Int32Ty = llvm::Type::getInt32Ty(Ctx);
 
   llvm::Type *FunctionRecordTypes[] = {
diff --git a/lib/IRGen/GenDecl.cpp b/lib/IRGen/GenDecl.cpp
@@ -4440,7 +4440,7 @@ llvm::Constant *IRGenModule::getAddrOfGlobalUTF16String(StringRef utf8) {
   *toPtr = 0;
   ArrayRef<llvm::UTF16> utf16(&buffer[0], utf16Length + 1);
 
-  auto init = llvm::ConstantDataArray::get(LLVMContext, utf16);
+  auto init = llvm::ConstantDataArray::get(getLLVMContext(), utf16);
   auto global = new llvm::GlobalVariable(Module, init->getType(), true,
                                          llvm::GlobalValue::PrivateLinkage,
                                          init);
diff --git a/lib/IRGen/GenFunc.cpp b/lib/IRGen/GenFunc.cpp
@@ -1809,7 +1809,7 @@ void irgen::emitBlockHeader(IRGenFunction &IGF,
 
   const clang::ASTContext &ASTContext = IGF.IGM.getClangASTContext();
   llvm::IntegerType *UnsignedLongTy =
-      llvm::IntegerType::get(IGF.IGM.LLVMContext,
+      llvm::IntegerType::get(IGF.IGM.getLLVMContext(),
                              ASTContext.getTypeSize(ASTContext.UnsignedLongTy));
   descriptorFields.addInt(UnsignedLongTy, 0);
   descriptorFields.addInt(UnsignedLongTy,
diff --git a/lib/IRGen/GenHeap.cpp b/lib/IRGen/GenHeap.cpp
@@ -1239,8 +1239,8 @@ llvm::Constant *IRGenModule::getFixLifetimeFn() {
                             llvm::Attribute::NoInline);
 
   // Give the function an empty body.
-  auto entry = llvm::BasicBlock::Create(LLVMContext, "", fixLifetime);
-  llvm::ReturnInst::Create(LLVMContext, entry);
+  auto entry = llvm::BasicBlock::Create(getLLVMContext(), "", fixLifetime);
+  llvm::ReturnInst::Create(getLLVMContext(), entry);
   
   FixLifetimeFn = fixLifetime;
   return fixLifetime;
diff --git a/lib/IRGen/GenIntegerLiteral.cpp b/lib/IRGen/GenIntegerLiteral.cpp
@@ -127,7 +127,7 @@ class IntegerLiteralTypeInfo :
 llvm::StructType *IRGenModule::getIntegerLiteralTy() {
   if (!IntegerLiteralTy) {
     IntegerLiteralTy =
-      llvm::StructType::create(LLVMContext, {
+      llvm::StructType::create(getLLVMContext(), {
                                  SizeTy->getPointerTo(),
                                  SizeTy
                                }, "swift.int_literal");
diff --git a/lib/IRGen/GenMeta.cpp b/lib/IRGen/GenMeta.cpp
@@ -3430,7 +3430,7 @@ void IRGenFunction::setInvariantLoad(llvm::LoadInst *load) {
 void IRGenFunction::setDereferenceableLoad(llvm::LoadInst *load,
                                            unsigned size) {
   auto sizeConstant = llvm::ConstantInt::get(IGM.Int64Ty, size);
-  auto sizeNode = llvm::MDNode::get(IGM.LLVMContext,
+  auto sizeNode = llvm::MDNode::get(IGM.getLLVMContext(),
                                   llvm::ConstantAsMetadata::get(sizeConstant));
   load->setMetadata(IGM.DereferenceableID, sizeNode);
 }
diff --git a/lib/IRGen/GenObjC.cpp b/lib/IRGen/GenObjC.cpp
@@ -129,7 +129,7 @@ llvm::InlineAsm *IRGenModule::getObjCRetainAutoreleasedReturnValueMarker() {
   if (IRGen.Opts.shouldOptimize()) {
     const char *markerKey = "clang.arc.retainAutoreleasedReturnValueMarker";
     if (!Module.getModuleFlag(markerKey)) {
-      auto *str = llvm::MDString::get(LLVMContext, asmString);
+      auto *str = llvm::MDString::get(getLLVMContext(), asmString);
       Module.addModuleFlag(llvm::Module::Error, markerKey, str);
     }
 
@@ -259,7 +259,7 @@ llvm::Constant *IRGenModule::getAddrOfObjCMethodName(StringRef selector) {
   if (entry) return entry;
 
   // If not, create it.  This implicitly adds a trailing null.
-  auto init = llvm::ConstantDataArray::getString(LLVMContext, selector);
+  auto init = llvm::ConstantDataArray::getString(getLLVMContext(), selector);
   auto global = new llvm::GlobalVariable(Module, init->getType(), false,
                                          llvm::GlobalValue::PrivateLinkage,
                                          init,
diff --git a/lib/IRGen/GenType.cpp b/lib/IRGen/GenType.cpp
@@ -1797,7 +1797,8 @@ TypeConverter::getOpaqueStorageTypeInfo(Size size, Alignment align) {
   // Use an [N x i8] array for storage, but load and store as a single iNNN
   // scalar.
   auto storageType = llvm::ArrayType::get(IGM.Int8Ty, size.getValue());
-  auto intType = llvm::IntegerType::get(IGM.LLVMContext, size.getValueInBits());
+  auto intType = llvm::IntegerType::get(IGM.getLLVMContext(),
+                                        size.getValueInBits());
   // There are no spare bits in an opaque storage type.
   auto type = new OpaqueStorageTypeInfo(storageType, intType, size,
                     SpareBitVector::getConstant(size.getValueInBits(), false),
diff --git a/lib/IRGen/IRGenFunction.cpp b/lib/IRGen/IRGenFunction.cpp
@@ -178,7 +178,7 @@ llvm::Value *IRGenFunction::emitVerifyEndOfLifetimeCall(llvm::Value *object,
 void IRGenFunction::emitAllocBoxCall(llvm::Value *typeMetadata,
                                       llvm::Value *&box,
                                       llvm::Value *&valueAddress) {
-  auto attrs = llvm::AttributeList::get(IGM.LLVMContext,
+  auto attrs = llvm::AttributeList::get(IGM.getLLVMContext(),
                                         llvm::AttributeList::FunctionIndex,
                                         llvm::Attribute::NoUnwind);
 
@@ -195,7 +195,7 @@ void IRGenFunction::emitMakeBoxUniqueCall(llvm::Value *box,
                                           llvm::Value *alignMask,
                                           llvm::Value *&outBox,
                                           llvm::Value *&outValueAddress) {
-  auto attrs = llvm::AttributeList::get(IGM.LLVMContext,
+  auto attrs = llvm::AttributeList::get(IGM.getLLVMContext(),
                                         llvm::AttributeList::FunctionIndex,
                                         llvm::Attribute::NoUnwind);
 
@@ -210,7 +210,7 @@ void IRGenFunction::emitMakeBoxUniqueCall(llvm::Value *box,
 
 void IRGenFunction::emitDeallocBoxCall(llvm::Value *box,
                                         llvm::Value *typeMetadata) {
-  auto attrs = llvm::AttributeList::get(IGM.LLVMContext,
+  auto attrs = llvm::AttributeList::get(IGM.getLLVMContext(),
                                         llvm::AttributeList::FunctionIndex,
                                         llvm::Attribute::NoUnwind);
 
@@ -227,7 +227,7 @@ llvm::Value *IRGenFunction::emitProjectBoxCall(llvm::Value *box,
     llvm::Attribute::ReadNone,
   };
   auto attrs = llvm::AttributeList::get(
-      IGM.LLVMContext, llvm::AttributeList::FunctionIndex, attrKinds);
+      IGM.getLLVMContext(), llvm::AttributeList::FunctionIndex, attrKinds);
   llvm::CallInst *call =
     Builder.CreateCall(IGM.getProjectBoxFn(), box);
   call->setCallingConv(IGM.DefaultCC);
@@ -236,7 +236,7 @@ llvm::Value *IRGenFunction::emitProjectBoxCall(llvm::Value *box,
 }
 
 llvm::Value *IRGenFunction::emitAllocEmptyBoxCall() {
-  auto attrs = llvm::AttributeList::get(IGM.LLVMContext,
+  auto attrs = llvm::AttributeList::get(IGM.getLLVMContext(),
                                         llvm::AttributeList::FunctionIndex,
                                         llvm::Attribute::NoUnwind);
   llvm::CallInst *call =
diff --git a/lib/IRGen/IRGenModule.cpp b/lib/IRGen/IRGenModule.cpp
diff --git a/lib/IRGen/IRGenModule.h b/lib/IRGen/IRGenModule.h

Original file line number	Diff line number	Diff line change
`@@ -435,7 +435,7 @@ withOpaqueTypeGenericArgs(IRGenFunction &IGF,`
`435`	`435`	`}`
`436`	`436`	`types.push_back(args.back()->getType());`
`437`	`437`	`});`
`438`		`- auto bufTy = llvm::StructType::get(IGF.IGM.LLVMContext, types);`
	`438`	`+ auto bufTy = llvm::StructType::get(IGF.IGM.getLLVMContext(), types);`
`439`	`439`	`alloca = IGF.createAlloca(bufTy, IGF.IGM.getPointerAlignment());`
`440`	`440`	`allocaSize = IGF.IGM.getPointerSize() * args.size();`
`441`	`441`	`IGF.Builder.CreateLifetimeStart(alloca, allocaSize);`
Original file line number	Diff line number	Diff line change
`@@ -657,7 +657,7 @@ if (Builtin.ID == BuiltinValueKind::id) { \`
`657`	`657`	`// If the type is floating-point, then we need to bitcast to integer.`
`658`	`658`	`auto valueTy = origValueTy;`
`659`	`659`	`if (valueTy->isFloatingPointTy()) {`
`660`		`- valueTy = llvm::IntegerType::get(IGF.IGM.LLVMContext,`
	`660`	`+ valueTy = llvm::IntegerType::get(IGF.IGM.getLLVMContext(),`
`661`	`661`	`valueTy->getPrimitiveSizeInBits());`
`662`	`662`	`}`
`663`	`663`
Original file line number	Diff line number	Diff line change
`@@ -53,11 +53,11 @@ llvm::Constant *irgen::emitConstantInt(IRGenModule &IGM,`
`53`	`53`	`assert(width.isFixedWidth() && "impossible width value");`
`54`	`54`	`}`
`55`	`55`
`56`		`- return llvm::ConstantInt::get(IGM.LLVMContext, value);`
	`56`	`+ return llvm::ConstantInt::get(IGM.getLLVMContext(), value);`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`llvm::Constant irgen::emitConstantFP(IRGenModule &IGM, FloatLiteralInst FLI) {`
`60`		`- return llvm::ConstantFP::get(IGM.LLVMContext, FLI->getValue());`
	`60`	`+ return llvm::ConstantFP::get(IGM.getLLVMContext(), FLI->getValue());`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`llvm::Constant *irgen::emitAddrOfConstantString(IRGenModule &IGM,`
Original file line number	Diff line number	Diff line change
`@@ -3430,7 +3430,7 @@ void IRGenFunction::setInvariantLoad(llvm::LoadInst *load) {`
`3430`	`3430`	`void IRGenFunction::setDereferenceableLoad(llvm::LoadInst *load,`
`3431`	`3431`	`unsigned size) {`
`3432`	`3432`	`auto sizeConstant = llvm::ConstantInt::get(IGM.Int64Ty, size);`
`3433`		`- auto sizeNode = llvm::MDNode::get(IGM.LLVMContext,`
	`3433`	`+ auto sizeNode = llvm::MDNode::get(IGM.getLLVMContext(),`
`3434`	`3434`	`llvm::ConstantAsMetadata::get(sizeConstant));`
`3435`	`3435`	`load->setMetadata(IGM.DereferenceableID, sizeNode);`
`3436`	`3436`	`}`