Revert the ConstantInt constructors back to their 2.5 forms where possible, thanks to contexts-on-types. More to come.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@77011 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 13 insertions, 15 deletions

diff --git a/unittests/VMCore/ConstantsTest.cpp b/unittests/VMCore/ConstantsTest.cpp
index aaf3d2703e7..2fa5e559dc3 100644
--- a/unittests/VMCore/ConstantsTest.cpp
+++ b/unittests/VMCore/ConstantsTest.cpp
@@ -17,11 +17,10 @@ namespace {
 
 TEST(ConstantsTest, Integer_i1) {
   const IntegerType* Int1 = IntegerType::get(1);
-  Constant* One = getGlobalContext().getConstantInt(Int1, 1, true);
-  Constant* Zero = getGlobalContext().getConstantInt(Int1, 0);
-  Constant* NegOne =
-    getGlobalContext().getConstantInt(Int1, static_cast<uint64_t>(-1), true);
-  EXPECT_EQ(NegOne, getGlobalContext().getConstantIntSigned(Int1, -1));
+  Constant* One = ConstantInt::get(Int1, 1, true);
+  Constant* Zero = ConstantInt::get(Int1, 0);
+  Constant* NegOne = ConstantInt::get(Int1, static_cast<uint64_t>(-1), true);
+  EXPECT_EQ(NegOne, ConstantInt::getSigned(Int1, -1));
   Constant* Undef = getGlobalContext().getUndef(Int1);
 
   // Input:  @b = constant i1 add(i1 1 , i1 1)
@@ -99,16 +98,15 @@ TEST(ConstantsTest, Integer_i1) {
 
 TEST(ConstantsTest, IntSigns) {
   const IntegerType* Int8Ty = Type::Int8Ty;
-  LLVMContext &Context = getGlobalContext();
-  EXPECT_EQ(100, Context.getConstantInt(Int8Ty, 100, false)->getSExtValue());
-  EXPECT_EQ(100, Context.getConstantInt(Int8Ty, 100, true)->getSExtValue());
-  EXPECT_EQ(100, Context.getConstantIntSigned(Int8Ty, 100)->getSExtValue());
-  EXPECT_EQ(-50, Context.getConstantInt(Int8Ty, 206)->getSExtValue());
-  EXPECT_EQ(-50, Context.getConstantIntSigned(Int8Ty, -50)->getSExtValue());
-  EXPECT_EQ(206U, Context.getConstantIntSigned(Int8Ty, -50)->getZExtValue());
+  EXPECT_EQ(100, ConstantInt::get(Int8Ty, 100, false)->getSExtValue());
+  EXPECT_EQ(100, ConstantInt::get(Int8Ty, 100, true)->getSExtValue());
+  EXPECT_EQ(100, ConstantInt::getSigned(Int8Ty, 100)->getSExtValue());
+  EXPECT_EQ(-50, ConstantInt::get(Int8Ty, 206)->getSExtValue());
+  EXPECT_EQ(-50, ConstantInt::getSigned(Int8Ty, -50)->getSExtValue());
+  EXPECT_EQ(206U, ConstantInt::getSigned(Int8Ty, -50)->getZExtValue());
 
   // Overflow is handled by truncation.
-  EXPECT_EQ(0x3b, Context.getConstantInt(Int8Ty, 0x13b)->getSExtValue());
+  EXPECT_EQ(0x3b, ConstantInt::get(Int8Ty, 0x13b)->getSExtValue());
 }
 
 }  // end anonymous namespace
diff --git a/unittests/VMCore/MetadataTest.cpp b/unittests/VMCore/MetadataTest.cpp
index d612808b9f6..5da1328803f 100644
--- a/unittests/VMCore/MetadataTest.cpp
+++ b/unittests/VMCore/MetadataTest.cpp
@@ -69,7 +69,7 @@ TEST(MDNodeTest, Simple) {
 
   MDString *s1 = getGlobalContext().getMDString(&x[0], 3);
   MDString *s2 = getGlobalContext().getMDString(&y[0], 3);
-  ConstantInt *CI = getGlobalContext().getConstantInt(APInt(8, 0));
+  ConstantInt *CI = ConstantInt::get(getGlobalContext(), APInt(8, 0));
 
   std::vector<Value *> V;
   V.push_back(s1);
@@ -102,7 +102,7 @@ TEST(MDNodeTest, Simple) {
 }
 
 TEST(MDNodeTest, Delete) {
-  Constant *C = getGlobalContext().getConstantInt(Type::Int32Ty, 1);
+  Constant *C = ConstantInt::get(Type::Int32Ty, 1);
   Instruction *I = new BitCastInst(C, Type::Int32Ty);
 
   Value *const V = I;