maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Don't use NamedDecl::getNameAsCString() when dealing with C++ methods, 

since they may not have normal identifiers for names. Fixes PR6369.

llvm-svn: 96784
This commit is contained in:
Douglas Gregor 2010-02-22 16:44:27 +00:00
parent 30ece5b807
commit 76eb74a1cd
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
clang/lib/CodeGen/CGVtable.cpp
View File

@ -1877,10 +1877,10 @@ private:
// If already set, note the two sets as the same
if (0)
printf("%s::%s same as %s::%s\n",
PrevU->getParent()->getNameAsCString(),
PrevU->getNameAsCString(),
U->getParent()->getNameAsCString(),
U->getNameAsCString());
PrevU->getParent()->getNameAsString().c_str(),
PrevU->getNameAsString().c_str(),
U->getParent()->getNameAsString().c_str(),
U->getNameAsString().c_str());
ForwardUnique[PrevU] = U;
return;
}
@ -1888,11 +1888,11 @@ private:
// Not set, set it now
if (0)
printf("marking %s::%s %p override as %s::%s\n",
MD->getParent()->getNameAsCString(),
MD->getNameAsCString(),
MD->getParent()->getNameAsString().c_str(),
MD->getNameAsString().c_str(),
(void*)MD,
U->getParent()->getNameAsCString(),
U->getNameAsCString());
U->getParent()->getNameAsString().c_str(),
U->getNameAsString().c_str());
UniqueOverrider[MD] = U;
for (CXXMethodDecl::method_iterator mi = MD->begin_overridden_methods(),
@ -1914,8 +1914,8 @@ private:
BuildUniqueOverrider(MD, MD);
if (0)
printf("top set is %s::%s %p\n",
MD->getParent()->getNameAsCString(),
MD->getNameAsCString(),
MD->getParent()->getNameAsString().c_str(),
MD->getNameAsString().c_str(),
(void*)MD);
ForwardUnique[MD] = MD;
}
@ -1950,7 +1950,7 @@ private:
A_t::iterator J = I;
while (++J != E && DclCmp(I, J) == 0)
if (DclIsSame(*I, *J)) {
if (0) printf("connecting %s\n", (*I)->getNameAsCString());
if (0) printf("connecting %s\n", (*I)->getNameAsString().c_str());
ForwardUnique[*J] = *I;
}
}
@ -2178,7 +2178,7 @@ public:
return;
D1(printf(" vfn for %s at %d\n",
dyn_cast<CXXMethodDecl>(GD.getDecl())->getNameAsCString(),
dyn_cast<CXXMethodDecl>(GD.getDecl())->getNameAsString().c_str(),
(int)Methods.size()));
// We didn't find an entry in the vtable that we could use, add a new
@ -2201,7 +2201,7 @@ public:
idx = VCalls.size()+1;
VCalls.push_back(Offset/8 - CurrentVBaseOffset/8);
D1(printf(" vcall for %s at %d with delta %d\n",
dyn_cast<CXXMethodDecl>(GD.getDecl())->getNameAsCString(),
dyn_cast<CXXMethodDecl>(GD.getDecl())->getNameAsString().c_str(),
(int)-VCalls.size()-3, (int)VCalls[idx-1]));
}
}