Switch GlobalVariable ctors to a sane API, where *either* a context or a module is required.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@75025 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/bugpoint/ExtractFunction.cpp b/tools/bugpoint/ExtractFunction.cpp
index 84eb1e7..6cd2d19 100644
--- a/tools/bugpoint/ExtractFunction.cpp
+++ b/tools/bugpoint/ExtractFunction.cpp
@@ -236,9 +236,9 @@
GV->eraseFromParent();
if (!M1Tors.empty()) {
Constant *M1Init = GetTorInit(M1Tors);
- new GlobalVariable(M1->getContext(), M1Init->getType(), false,
+ new GlobalVariable(*M1, M1Init->getType(), false,
GlobalValue::AppendingLinkage,
- M1Init, GlobalName, M1);
+ M1Init, GlobalName);
}
GV = M2->getNamedGlobal(GlobalName);
@@ -248,9 +248,9 @@
GV->eraseFromParent();
if (!M2Tors.empty()) {
Constant *M2Init = GetTorInit(M2Tors);
- new GlobalVariable(M2->getContext(), M2Init->getType(), false,
+ new GlobalVariable(*M2, M2Init->getType(), false,
GlobalValue::AppendingLinkage,
- M2Init, GlobalName, M2);
+ M2Init, GlobalName);
}
}
diff --git a/tools/bugpoint/Miscompilation.cpp b/tools/bugpoint/Miscompilation.cpp
index 369f25a..a24ea77 100644
--- a/tools/bugpoint/Miscompilation.cpp
+++ b/tools/bugpoint/Miscompilation.cpp
@@ -703,10 +703,9 @@
// 1. Add a string constant with its name to the global file
Constant *InitArray = ConstantArray::get(F->getName());
GlobalVariable *funcName =
- new GlobalVariable(Safe->getContext(),
- InitArray->getType(), true /*isConstant*/,
+ new GlobalVariable(*Safe, InitArray->getType(), true /*isConstant*/,
GlobalValue::InternalLinkage, InitArray,
- F->getName() + "_name", Safe);
+ F->getName() + "_name");
// 2. Use `GetElementPtr *funcName, 0, 0' to convert the string to an
// sbyte* so it matches the signature of the resolver function.
@@ -723,9 +722,9 @@
// Create a new global to hold the cached function pointer.
Constant *NullPtr = ConstantPointerNull::get(F->getType());
GlobalVariable *Cache =
- new GlobalVariable(F->getParent()->getContext(),
- F->getType(), false,GlobalValue::InternalLinkage,
- NullPtr,F->getName()+".fpcache", F->getParent());
+ new GlobalVariable(*F->getParent(), F->getType(),
+ false, GlobalValue::InternalLinkage,
+ NullPtr,F->getName()+".fpcache");
// Construct a new stub function that will re-route calls to F
const FunctionType *FuncTy = F->getFunctionType();