Rename some GC classes so that their roll will hopefully be clearer.

In particular, Collector was confusing to implementors. Several
thought that this compile-time class was the place to implement
their runtime GC heap. Of course, it doesn't even exist at runtime.
Specifically, the renames are:

  Collector               -> GCStrategy
  CollectorMetadata       -> GCFunctionInfo
  CollectorModuleMetadata -> GCModuleInfo
  CollectorRegistry       -> GCRegistry
  Function::getCollector  -> getGC (setGC, hasGC, clearGC)

Several accessors and nested types have also been renamed to be
consistent. These changes should be obvious.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@54899 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Gordon Henriksen
2008-08-17 18:44:35 +00:00
parent 94fb5f2a70
commit 5eca075b74
38 changed files with 524 additions and 678 deletions

View File

@ -892,7 +892,7 @@ bool BitcodeReader::ParseModule(const std::string &ModuleID) {
SmallVector<uint64_t, 64> Record;
std::vector<std::string> SectionTable;
std::vector<std::string> CollectorTable;
std::vector<std::string> GCTable;
// Read all the records for this module.
while (!Stream.AtEndOfStream()) {
@ -1019,11 +1019,11 @@ bool BitcodeReader::ParseModule(const std::string &ModuleID) {
SectionTable.push_back(S);
break;
}
case bitc::MODULE_CODE_COLLECTORNAME: { // SECTIONNAME: [strchr x N]
case bitc::MODULE_CODE_GCNAME: { // SECTIONNAME: [strchr x N]
std::string S;
if (ConvertToString(Record, 0, S))
return Error("Invalid MODULE_CODE_COLLECTORNAME record");
CollectorTable.push_back(S);
return Error("Invalid MODULE_CODE_GCNAME record");
GCTable.push_back(S);
break;
}
// GLOBALVAR: [pointer type, isconst, initid,
@ -1070,7 +1070,7 @@ bool BitcodeReader::ParseModule(const std::string &ModuleID) {
break;
}
// FUNCTION: [type, callingconv, isproto, linkage, paramattr,
// alignment, section, visibility, collector]
// alignment, section, visibility, gc]
case bitc::MODULE_CODE_FUNCTION: {
if (Record.size() < 8)
return Error("Invalid MODULE_CODE_FUNCTION record");
@ -1098,9 +1098,9 @@ bool BitcodeReader::ParseModule(const std::string &ModuleID) {
}
Func->setVisibility(GetDecodedVisibility(Record[7]));
if (Record.size() > 8 && Record[8]) {
if (Record[8]-1 > CollectorTable.size())
return Error("Invalid collector ID");
Func->setCollector(CollectorTable[Record[8]-1].c_str());
if (Record[8]-1 > GCTable.size())
return Error("Invalid GC ID");
Func->setGC(GCTable[Record[8]-1].c_str());
}
ValueList.push_back(Func);