<div dir="ltr">Did you mean to add a "remove in 4.0" comment?</div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Jan 8, 2015 at 6:48 PM, Duncan P. N. Exon Smith <span dir="ltr"><<a href="mailto:dexonsmith@apple.com" target="_blank">dexonsmith@apple.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: dexonsmith<br>
Date: Thu Jan 8 20:48:48 2015<br>
New Revision: 225498<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=225498&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=225498&view=rev</a><br>
Log:<br>
Bitcode: Move the DEBUG_LOC record to DEBUG_LOC_OLD<br>
<br>
Prepare to simplify the `DebugLoc` record.<br>
<br>
Modified:<br>
llvm/trunk/include/llvm/Bitcode/LLVMBitCodes.h<br>
llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp<br>
llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp<br>
llvm/trunk/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp<br>
<br>
Modified: llvm/trunk/include/llvm/Bitcode/LLVMBitCodes.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Bitcode/LLVMBitCodes.h?rev=225498&r1=225497&r2=225498&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Bitcode/LLVMBitCodes.h?rev=225498&r1=225497&r2=225498&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/Bitcode/LLVMBitCodes.h (original)<br>
+++ llvm/trunk/include/llvm/Bitcode/LLVMBitCodes.h Thu Jan 8 20:48:48 2015<br>
@@ -314,7 +314,7 @@ namespace bitc {<br>
<br>
FUNC_CODE_INST_CALL = 34, // CALL: [attr, cc, fnty, fnid, args...]<br>
<br>
- FUNC_CODE_DEBUG_LOC = 35, // DEBUG_LOC: [Line,Col,ScopeVal, IAVal]<br>
+ FUNC_CODE_DEBUG_LOC_OLD = 35, // DEBUG_LOC: [Line,Col,ScopeVal, IAVal]<br>
FUNC_CODE_INST_FENCE = 36, // FENCE: [ordering, synchscope]<br>
FUNC_CODE_INST_CMPXCHG = 37, // CMPXCHG: [ptrty,ptr,cmp,new, align, vol,<br>
// ordering, synchscope]<br>
<br>
Modified: llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp?rev=225498&r1=225497&r2=225498&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp?rev=225498&r1=225497&r2=225498&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp (original)<br>
+++ llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp Thu Jan 8 20:48:48 2015<br>
@@ -2560,7 +2560,7 @@ std::error_code BitcodeReader::ParseFunc<br>
I = nullptr;<br>
continue;<br>
<br>
- case bitc::FUNC_CODE_DEBUG_LOC: { // DEBUG_LOC: [line, col, scope, ia]<br>
+ case bitc::FUNC_CODE_DEBUG_LOC_OLD: { // DEBUG_LOC_OLD: [line,col,scope,ia]<br>
I = nullptr; // Get the last instruction emitted.<br>
if (CurBB && !CurBB->empty())<br>
I = &CurBB->back();<br>
<br>
Modified: llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp?rev=225498&r1=225497&r2=225498&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp?rev=225498&r1=225497&r2=225498&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp (original)<br>
+++ llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp Thu Jan 8 20:48:48 2015<br>
@@ -1718,7 +1718,7 @@ static void WriteFunction(const Function<br>
Vals.push_back(DL.getCol());<br>
Vals.push_back(Scope ? VE.getMetadataID(Scope) + 1 : 0);<br>
Vals.push_back(IA ? VE.getMetadataID(IA) + 1 : 0);<br>
- Stream.EmitRecord(bitc::FUNC_CODE_DEBUG_LOC, Vals);<br>
+ Stream.EmitRecord(bitc::FUNC_CODE_DEBUG_LOC_OLD, Vals);<br>
Vals.clear();<br>
<br>
LastDL = DL;<br>
<br>
Modified: llvm/trunk/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp?rev=225498&r1=225497&r2=225498&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp?rev=225498&r1=225497&r2=225498&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp (original)<br>
+++ llvm/trunk/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp Thu Jan 8 20:48:48 2015<br>
@@ -247,7 +247,7 @@ static const char *GetCodeName(unsigned<br>
case bitc::FUNC_CODE_INST_VSELECT: return "INST_VSELECT";<br>
case bitc::FUNC_CODE_DEBUG_LOC_AGAIN: return "DEBUG_LOC_AGAIN";<br>
case bitc::FUNC_CODE_INST_CALL: return "INST_CALL";<br>
- case bitc::FUNC_CODE_DEBUG_LOC: return "DEBUG_LOC";<br>
+ case bitc::FUNC_CODE_DEBUG_LOC_OLD: return "DEBUG_LOC_OLD";<br>
}<br>
case bitc::VALUE_SYMTAB_BLOCK_ID:<br>
switch (CodeID) {<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>