GCStrategy *GCModuleInfo::getOrCreateStrategy(const Module *M,
const std::string &Name) {
- const char *Start = Name.c_str();
-
- strategy_map_type::iterator NMI =
- StrategyMap.find(Start, Start + Name.size());
+ strategy_map_type::iterator NMI = StrategyMap.find(Name);
if (NMI != StrategyMap.end())
return NMI->getValue();
for (GCRegistry::iterator I = GCRegistry::begin(),
E = GCRegistry::end(); I != E; ++I) {
- if (strcmp(Start, I->getName()) == 0) {
+ if (Name == I->getName()) {
GCStrategy *S = I->instantiate();
S->M = M;
S->Name = Name;
- StrategyMap.GetOrCreateValue(Start, Start + Name.size()).setValue(S);
+ StrategyMap.GetOrCreateValue(Name).setValue(S);
StrategyList.push_back(S);
return S;
}
}
cerr << "unsupported GC: " << Name << "\n";
- llvm_unreachable();
+ llvm_unreachable(0);
}
GCFunctionInfo &GCModuleInfo::getFunctionInfo(const Function &F) {
static const char *DescKind(GC::PointKind Kind) {
switch (Kind) {
- default: assert(0 && "Unknown GC point kind");
+ default: llvm_unreachable("Unknown GC point kind");
case GC::Loop: return "loop";
case GC::Return: return "return";
case GC::PreCall: return "pre-call";
if (!F.hasGC()) {
GCFunctionInfo *FD = &getAnalysis<GCModuleInfo>().getFunctionInfo(F);
- OS << "GC roots for " << FD->getFunction().getNameStart() << ":\n";
+ OS << "GC roots for " << FD->getFunction().getNameStr() << ":\n";
for (GCFunctionInfo::roots_iterator RI = FD->roots_begin(),
RE = FD->roots_end(); RI != RE; ++RI)
OS << "\t" << RI->Num << "\t" << RI->StackOffset << "[sp]\n";
- OS << "GC safe points for " << FD->getFunction().getNameStart() << ":\n";
+ OS << "GC safe points for " << FD->getFunction().getNameStr() << ":\n";
for (GCFunctionInfo::iterator PI = FD->begin(),
PE = FD->end(); PI != PE; ++PI) {