nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[opaque pointer type] More GEP API migrations

Browse Source 
Looks like the VTable code in particular will need some work to pass
around the pointee type explicitly.

llvm-svn: 234128
This commit is contained in:
David Blaikie
2015-04-05 22:45:47 +00:00
parent 1b01e7e263
commit 1ed728c499
20 changed files with 189 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
clang/lib/CodeGen/CodeGenModule.cpp
View File

@@ -2564,8 +2564,8 @@ llvm::Function *CodeGenModule::getIntrinsic(unsigned IID,
Tys);
}
static llvm::StringMapEntry<llvm::Constant*> &
GetConstantCFStringEntry(llvm::StringMap<llvm::Constant*> &Map,
static llvm::StringMapEntry<llvm::GlobalVariable*> &
GetConstantCFStringEntry(llvm::StringMap<llvm::GlobalVariable*> &Map,
const StringLiteral *Literal,
bool TargetIsLSB,
bool &IsUTF16,
@@ -2601,8 +2601,8 @@ GetConstantCFStringEntry(llvm::StringMap<llvm::Constant*> &Map,
nullptr)).first;
}
static llvm::StringMapEntry<llvm::Constant*> &
GetConstantStringEntry(llvm::StringMap<llvm::Constant*> &Map,
static llvm::StringMapEntry<llvm::GlobalVariable*> &
GetConstantStringEntry(llvm::StringMap<llvm::GlobalVariable*> &Map,
const StringLiteral *Literal,
unsigned &StringLength) {
StringRef String = Literal->getString();
@@ -2614,7 +2614,7 @@ llvm::Constant *
CodeGenModule::GetAddrOfConstantCFString(const StringLiteral *Literal) {
unsigned StringLength = 0;
bool isUTF16 = false;
llvm::StringMapEntry<llvm::Constant*> &Entry =
llvm::StringMapEntry<llvm::GlobalVariable*> &Entry =
GetConstantCFStringEntry(CFConstantStringMap, Literal,
getDataLayout().isLittleEndian(),
isUTF16, StringLength);
@@ -2707,10 +2707,10 @@ CodeGenModule::GetAddrOfConstantCFString(const StringLiteral *Literal) {
return GV;
}
llvm::Constant *
llvm::GlobalVariable *
CodeGenModule::GetAddrOfConstantString(const StringLiteral *Literal) {
unsigned StringLength = 0;
llvm::StringMapEntry<llvm::Constant*> &Entry =
llvm::StringMapEntry<llvm::GlobalVariable*> &Entry =
GetConstantStringEntry(CFConstantStringMap, Literal, StringLength);
if (auto *C = Entry.second)
@@ -2743,8 +2743,7 @@ CodeGenModule::GetAddrOfConstantString(const StringLiteral *Literal) {
V = llvm::ConstantExpr::getGetElementPtr(PTy, GV, Zeros);
ConstantStringClassRef = V;
}
}
else
} else
V = ConstantStringClassRef;
if (!NSConstantStringType) {