projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename some GC classes so that their roll will hopefully be clearer.
[oota-llvm.git]
/
lib
/
Bitcode
/
Reader
/
BitcodeReader.cpp
diff --git
a/lib/Bitcode/Reader/BitcodeReader.cpp
b/lib/Bitcode/Reader/BitcodeReader.cpp
index f7796a6f9f4390925aac3a777d49536993b9a2fd..a842bd3643d006fe62f9e9d1a03313d320177022 100644
(file)
--- a/
lib/Bitcode/Reader/BitcodeReader.cpp
+++ b/
lib/Bitcode/Reader/BitcodeReader.cpp
@@
-892,7
+892,7
@@
bool BitcodeReader::ParseModule(const std::string &ModuleID) {
SmallVector<uint64_t, 64> Record;
std::vector<std::string> SectionTable;
SmallVector<uint64_t, 64> Record;
std::vector<std::string> SectionTable;
- std::vector<std::string>
Collector
Table;
+ std::vector<std::string>
GC
Table;
// Read all the records for this module.
while (!Stream.AtEndOfStream()) {
// 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;
}
SectionTable.push_back(S);
break;
}
- case bitc::MODULE_CODE_
COLLECTOR
NAME: { // SECTIONNAME: [strchr x N]
+ case bitc::MODULE_CODE_
GC
NAME: { // SECTIONNAME: [strchr x N]
std::string S;
if (ConvertToString(Record, 0, S))
std::string S;
if (ConvertToString(Record, 0, S))
- return Error("Invalid MODULE_CODE_
COLLECTOR
NAME record");
-
Collector
Table.push_back(S);
+ return Error("Invalid MODULE_CODE_
GC
NAME record");
+
GC
Table.push_back(S);
break;
}
// GLOBALVAR: [pointer type, isconst, initid,
break;
}
// GLOBALVAR: [pointer type, isconst, initid,
@@
-1070,7
+1070,7
@@
bool BitcodeReader::ParseModule(const std::string &ModuleID) {
break;
}
// FUNCTION: [type, callingconv, isproto, linkage, paramattr,
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");
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]) {
}
Func->setVisibility(GetDecodedVisibility(Record[7]));
if (Record.size() > 8 && Record[8]) {
- if (Record[8]-1 >
Collector
Table.size())
- return Error("Invalid
collector
ID");
- Func->set
Collector(Collector
Table[Record[8]-1].c_str());
+ if (Record[8]-1 >
GC
Table.size())
+ return Error("Invalid
GC
ID");
+ Func->set
GC(GC
Table[Record[8]-1].c_str());
}
ValueList.push_back(Func);
}
ValueList.push_back(Func);