diff options
| -rw-r--r-- | include/llvm/CodeGen/AsmPrinter.h | 2 | ||||
| -rw-r--r-- | lib/CodeGen/AsmPrinter/AsmPrinter.cpp | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/include/llvm/CodeGen/AsmPrinter.h b/include/llvm/CodeGen/AsmPrinter.h index c1d86a2190..d4e0c43219 100644 --- a/include/llvm/CodeGen/AsmPrinter.h +++ b/include/llvm/CodeGen/AsmPrinter.h @@ -390,7 +390,7 @@ namespace llvm { void EmitXXStructorList(Constant *List); void EmitGlobalConstantStruct(const ConstantStruct* CVS, unsigned AddrSpace); - void EmitGlobalConstantArray(const ConstantArray* CVA); + void EmitGlobalConstantArray(const ConstantArray* CVA, unsigned AddrSpace); void EmitGlobalConstantVector(const ConstantVector* CP); void EmitGlobalConstantFP(const ConstantFP* CFP, unsigned AddrSpace); void EmitGlobalConstantLargeInt(const ConstantInt* CI, unsigned AddrSpace); diff --git a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp index f1a45fd7ee..a815aabe5c 100644 --- a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp +++ b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp @@ -971,12 +971,13 @@ void AsmPrinter::EmitString(const ConstantArray *CVA) const { O << '\n'; } -void AsmPrinter::EmitGlobalConstantArray(const ConstantArray *CVA) { +void AsmPrinter::EmitGlobalConstantArray(const ConstantArray *CVA, + unsigned AddrSpace) { if (CVA->isString()) { EmitString(CVA); } else { // Not a string. Print the values in successive locations for (unsigned i = 0, e = CVA->getNumOperands(); i != e; ++i) - EmitGlobalConstant(CVA->getOperand(i)); + EmitGlobalConstant(CVA->getOperand(i), AddrSpace); } } @@ -1233,7 +1234,7 @@ void AsmPrinter::EmitGlobalConstant(const Constant *CV, unsigned AddrSpace) { EmitZeros(Size, AddrSpace); return; } else if (const ConstantArray *CVA = dyn_cast<ConstantArray>(CV)) { - EmitGlobalConstantArray(CVA); + EmitGlobalConstantArray(CVA , AddrSpace); return; } else if (const ConstantStruct *CVS = dyn_cast<ConstantStruct>(CV)) { EmitGlobalConstantStruct(CVS, AddrSpace); |