RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-19 11:02:59 +02:00
Code Issues Projects Releases Wiki Activity

Revert "Bitcode: Move the DEBUG_LOC record to DEBUG_LOC_OLD"

Browse Source 
This reverts commit r225498 (but leaves r225499, which was a worthy
cleanup).

My plan was to change `DEBUG_LOC` to store the `MDNode` directly rather
than its operands (patch was to go out this morning), but on reflection
it's not clear that it's strictly better.  (I had missed that the
current code is unlikely to emit the `MDNode` at all.)

Conflicts:
	lib/Bitcode/Reader/BitcodeReader.cpp (due to r225499)

llvm-svn: 225531
This commit is contained in:
Duncan P. N. Exon Smith 2015-01-09 17:53:27 +00:00
parent 8507fc3677
commit d9822c85c3
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/llvm/Bitcode/LLVMBitCodes.h
View File

@ -314,7 +314,7 @@ namespace bitc {
FUNC_CODE_INST_CALL = 34, // CALL: [attr, cc, fnty, fnid, args...]
FUNC_CODE_DEBUG_LOC_OLD = 35, // DEBUG_LOC: [Line,Col,ScopeVal, IAVal]
FUNC_CODE_DEBUG_LOC = 35, // DEBUG_LOC: [Line,Col,ScopeVal, IAVal]
FUNC_CODE_INST_FENCE = 36, // FENCE: [ordering, synchscope]
FUNC_CODE_INST_CMPXCHG = 37, // CMPXCHG: [ptrty,ptr,cmp,new, align, vol,
// ordering, synchscope]

2
lib/Bitcode/Reader/BitcodeReader.cpp
View File

@ -2561,7 +2561,7 @@ std::error_code BitcodeReader::ParseFunctionBody(Function *F) {
I = nullptr;
continue;
case bitc::FUNC_CODE_DEBUG_LOC_OLD: { // DEBUG_LOC_OLD: [line,col,scope,ia]
case bitc::FUNC_CODE_DEBUG_LOC: { // DEBUG_LOC: [line, col, scope, ia]
I = getLastInstruction();
if (!I || Record.size() < 4)
return Error(BitcodeError::InvalidRecord);

2
lib/Bitcode/Writer/BitcodeWriter.cpp
View File

@ -1718,7 +1718,7 @@ static void WriteFunction(const Function &F, ValueEnumerator &VE,
Vals.push_back(DL.getCol());
Vals.push_back(Scope ? VE.getMetadataID(Scope) + 1 : 0);
Vals.push_back(IA ? VE.getMetadataID(IA) + 1 : 0);
Stream.EmitRecord(bitc::FUNC_CODE_DEBUG_LOC_OLD, Vals);
Stream.EmitRecord(bitc::FUNC_CODE_DEBUG_LOC, Vals);
Vals.clear();
LastDL = DL;

2
tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp
View File

@ -247,7 +247,7 @@ static const char *GetCodeName(unsigned CodeID, unsigned BlockID,
case bitc::FUNC_CODE_INST_VSELECT: return "INST_VSELECT";
case bitc::FUNC_CODE_DEBUG_LOC_AGAIN: return "DEBUG_LOC_AGAIN";
case bitc::FUNC_CODE_INST_CALL: return "INST_CALL";
case bitc::FUNC_CODE_DEBUG_LOC_OLD: return "DEBUG_LOC_OLD";
case bitc::FUNC_CODE_DEBUG_LOC: return "DEBUG_LOC";
}
case bitc::VALUE_SYMTAB_BLOCK_ID:
switch (CodeID) {