Remove dependence on the return type of ConstantArray::get

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

diff --git a/lib/Transforms/Instrumentation/EmitFunctions.cpp b/lib/Transforms/Instrumentation/EmitFunctions.cpp
index 57254b90800eed0fcd7060eb04628dc7b83f6495..0025d3e2b601aca3350da25fbd4e51ca6fc12167 100644 (file)
--- a/lib/Transforms/Instrumentation/EmitFunctions.cpp
+++ b/lib/Transforms/Instrumentation/EmitFunctions.cpp
@@ -89,7 +89,7 @@ bool EmitFunctionTable::run(Module &M){
                                           cstruct, "llvmFunctionTable");
   M.getGlobalList().push_back(gb);
 
-  ConstantArray *constArray = ConstantArray::get(ArrayType::get(Type::SByteTy, 
+  Constant *constArray = ConstantArray::get(ArrayType::get(Type::SByteTy, 
                                                                sBCons.size()),
                                                 sBCons);
 

diff --git a/lib/VMCore/Constants.cpp b/lib/VMCore/Constants.cpp
index f86fcc1a23be6cc0f916bc548c3f9aae3e45b142..280e00520e5f9e7c96b0af3d93ff87574f00d27f 100644 (file)
--- a/lib/VMCore/Constants.cpp
+++ b/lib/VMCore/Constants.cpp
@@ -434,7 +434,7 @@ void ConstantArray::replaceUsesOfWithOnConstant(Value *From, Value *To,
     Values.push_back(Val);
   }
   
-  ConstantArray *Replacement = ConstantArray::get(getType(), Values);
+  Constant *Replacement = ConstantArray::get(getType(), Values);
   assert(Replacement != this && "I didn't contain From!");
 
   // Everyone using this now uses the replacement...

diff --git a/projects/Stacker/lib/compiler/StackerCompiler.cpp b/projects/Stacker/lib/compiler/StackerCompiler.cpp
index 931796f9a81a42d2e9be46cd38e14e817579930a..118397938912ea79bd97e7cabfbd4515125c6ebc 100644 (file)
--- a/projects/Stacker/lib/compiler/StackerCompiler.cpp
+++ b/projects/Stacker/lib/compiler/StackerCompiler.cpp
@@ -173,7 +173,7 @@ StackerCompiler::compile(
        TheExit = new Function( 
            exit_type, GlobalValue::ExternalLinkage, "exit", TheModule);
 
-       ConstantArray* str_format = ConstantArray::get("%s");
+       Constant* str_format = ConstantArray::get("%s");
        StrFormat = new GlobalVariable( 
            /*type=*/ArrayType::get( Type::SByteTy,  3 ),
            /*isConstant=*/true,
@@ -183,7 +183,7 @@ StackerCompiler::compile(
            /*parent=*/TheModule
        );
 
-       ConstantArray* in_str_format = ConstantArray::get(" %as");
+       Constant* in_str_format = ConstantArray::get(" %as");
        InStrFormat = new GlobalVariable( 
            /*type=*/ArrayType::get( Type::SByteTy,  5 ),
            /*isConstant=*/true,
@@ -193,7 +193,7 @@ StackerCompiler::compile(
            /*parent=*/TheModule
        );
 
-       ConstantArray* num_format = ConstantArray::get("%d");
+       Constant* num_format = ConstantArray::get("%d");
        NumFormat = new GlobalVariable( 
            /*type=*/ArrayType::get( Type::SByteTy,  3 ),
            /*isConstant=*/true,
@@ -203,7 +203,7 @@ StackerCompiler::compile(
            /*parent=*/TheModule
        );
 
-       ConstantArray* in_num_format = ConstantArray::get(" %d");
+       Constant* in_num_format = ConstantArray::get(" %d");
        InNumFormat = new GlobalVariable( 
            /*type=*/ArrayType::get( Type::SByteTy,  4 ),
            /*isConstant=*/true,
@@ -213,7 +213,7 @@ StackerCompiler::compile(
            /*parent=*/TheModule
        );
 
-       ConstantArray* chr_format = ConstantArray::get("%c");
+       Constant* chr_format = ConstantArray::get("%c");
        ChrFormat = new GlobalVariable( 
            /*type=*/ArrayType::get( Type::SByteTy,  3 ),
            /*isConstant=*/true,
@@ -223,7 +223,7 @@ StackerCompiler::compile(
            /*parent=*/TheModule
        );
 
-       ConstantArray* in_chr_format = ConstantArray::get(" %c");
+       Constant* in_chr_format = ConstantArray::get(" %c");
        InChrFormat = new GlobalVariable( 
            /*type=*/ArrayType::get( Type::SByteTy,  4 ),
            /*isConstant=*/true,
@@ -413,7 +413,7 @@ StackerCompiler::push_string( BasicBlock* bb, const char* value )
     ArrayType* char_array = ArrayType::get( Type::SByteTy, len + 1 );
 
     // Create an initializer for the value
-    ConstantArray* initVal = ConstantArray::get( value );
+    Constant* initVal = ConstantArray::get( value );
 
     // Create an internal linkage global variable to hold the constant.
     GlobalVariable* strconst = new GlobalVariable(