aaron/ispc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix for off by one problem in debug info with LLVM 3.3+

Browse Source
This commit is contained in:
Dmitry Babokin
2014-03-11 18:40:16 +04:00
parent fa8776cfa2
commit 8999a69546
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
type.cpp
View File

@@ -1,5 +1,5 @@
/* /*
Copyright (c) 2010-2013, Intel Corporation Copyright (c) 2010-2014, Intel Corporation
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
@@ -81,6 +81,7 @@ lShouldPrintName(const std::string &name) {
the given element type. */ the given element type. */
static llvm::DIType static llvm::DIType
lCreateDIArray(llvm::DIType eltType, int count) { lCreateDIArray(llvm::DIType eltType, int count) {
#ifdef LLVM_3_2
int lowerBound = 0, upperBound = count-1; int lowerBound = 0, upperBound = count-1;
if (count == 0) { if (count == 0) {
@@ -90,6 +91,9 @@ lCreateDIArray(llvm::DIType eltType, int count) {
} }
llvm::Value *sub = m->diBuilder->getOrCreateSubrange(lowerBound, upperBound); llvm::Value *sub = m->diBuilder->getOrCreateSubrange(lowerBound, upperBound);
#else // LLVM 3.3+
llvm::Value *sub = m->diBuilder->getOrCreateSubrange(0, count);
#endif
std::vector<llvm::Value *> subs; std::vector<llvm::Value *> subs;
subs.push_back(sub); subs.push_back(sub);
llvm::DIArray subArray = m->diBuilder->getOrCreateArray(subs); llvm::DIArray subArray = m->diBuilder->getOrCreateArray(subs);
@@ -571,7 +575,11 @@ AtomicType::GetDIType(llvm::DIDescriptor scope) const {
} }
else if (variability == Variability::Varying) { else if (variability == Variability::Varying) {
llvm::DIType unifType = GetAsUniformType()->GetDIType(scope); llvm::DIType unifType = GetAsUniformType()->GetDIType(scope);
#ifdef LLVM_3_2
llvm::Value *sub = m->diBuilder->getOrCreateSubrange(0, g->target->getVectorWidth()-1); llvm::Value *sub = m->diBuilder->getOrCreateSubrange(0, g->target->getVectorWidth()-1);
#else // LLVM 3.3+
llvm::Value *sub = m->diBuilder->getOrCreateSubrange(0, g->target->getVectorWidth());
#endif
llvm::DIArray subArray = m->diBuilder->getOrCreateArray(sub); llvm::DIArray subArray = m->diBuilder->getOrCreateArray(sub);
uint64_t size = unifType.getSizeInBits() * g->target->getVectorWidth(); uint64_t size = unifType.getSizeInBits() * g->target->getVectorWidth();
uint64_t align = unifType.getAlignInBits() * g->target->getVectorWidth(); uint64_t align = unifType.getAlignInBits() * g->target->getVectorWidth();
@@ -838,7 +846,11 @@ EnumType::GetDIType(llvm::DIDescriptor scope) const {
case Variability::Uniform: case Variability::Uniform:
return diType; return diType;
case Variability::Varying: { case Variability::Varying: {
#ifdef LLVM_3_2
llvm::Value *sub = m->diBuilder->getOrCreateSubrange(0, g->target->getVectorWidth()-1); llvm::Value *sub = m->diBuilder->getOrCreateSubrange(0, g->target->getVectorWidth()-1);
#else // LLVM 3.3+
llvm::Value *sub = m->diBuilder->getOrCreateSubrange(0, g->target->getVectorWidth());
#endif
llvm::DIArray subArray = m->diBuilder->getOrCreateArray(sub); llvm::DIArray subArray = m->diBuilder->getOrCreateArray(sub);
uint64_t size = diType.getSizeInBits() * g->target->getVectorWidth(); uint64_t size = diType.getSizeInBits() * g->target->getVectorWidth();
uint64_t align = diType.getAlignInBits() * g->target->getVectorWidth(); uint64_t align = diType.getAlignInBits() * g->target->getVectorWidth();
@@ -1720,7 +1732,11 @@ VectorType::LLVMType(llvm::LLVMContext *ctx) const {
llvm::DIType llvm::DIType
VectorType::GetDIType(llvm::DIDescriptor scope) const { VectorType::GetDIType(llvm::DIDescriptor scope) const {
llvm::DIType eltType = base->GetDIType(scope); llvm::DIType eltType = base->GetDIType(scope);
#ifdef LLVM_3_2
llvm::Value *sub = m->diBuilder->getOrCreateSubrange(0, numElements-1); llvm::Value *sub = m->diBuilder->getOrCreateSubrange(0, numElements-1);
#else // LLVM 3.3+
llvm::Value *sub = m->diBuilder->getOrCreateSubrange(0, numElements);
#endif
llvm::DIArray subArray = m->diBuilder->getOrCreateArray(sub); llvm::DIArray subArray = m->diBuilder->getOrCreateArray(sub);
uint64_t sizeBits = eltType.getSizeInBits() * numElements; uint64_t sizeBits = eltType.getSizeInBits() * numElements;