[llvm] r225498 - Bitcode: Move the DEBUG_LOC record to DEBUG_LOC_OLD

[Duncan P. N. Exon Smith]

Nope, I was planning to commit that comment with the new `DEBUG_LOC`.

But I decided to revert this anyway in r225531 :(.

> On 2015-Jan-09, at 13:50, Sean Silva <chisophugis at gmail.com> wrote:
> 
> Did you mean to add a "remove in 4.0" comment?
> 
> On Thu, Jan 8, 2015 at 6:48 PM, Duncan P. N. Exon Smith <dexonsmith at apple.com> wrote:
> Author: dexonsmith
> Date: Thu Jan  8 20:48:48 2015
> New Revision: 225498
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=225498&view=rev
> Log:
> Bitcode: Move the DEBUG_LOC record to DEBUG_LOC_OLD
> 
> Prepare to simplify the `DebugLoc` record.
> 
> Modified:
>     llvm/trunk/include/llvm/Bitcode/LLVMBitCodes.h
>     llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp
>     llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp
>     llvm/trunk/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp
> 
> Modified: llvm/trunk/include/llvm/Bitcode/LLVMBitCodes.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Bitcode/LLVMBitCodes.h?rev=225498&r1=225497&r2=225498&view=diff
> ==============================================================================
> --- llvm/trunk/include/llvm/Bitcode/LLVMBitCodes.h (original)
> +++ llvm/trunk/include/llvm/Bitcode/LLVMBitCodes.h Thu Jan  8 20:48:48 2015
> @@ -314,7 +314,7 @@ namespace bitc {
> 
>      FUNC_CODE_INST_CALL        = 34, // CALL:    [attr, cc, fnty, fnid, args...]
> 
> -    FUNC_CODE_DEBUG_LOC        = 35, // DEBUG_LOC:  [Line,Col,ScopeVal, IAVal]
> +    FUNC_CODE_DEBUG_LOC_OLD    = 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]
> 
> Modified: llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp?rev=225498&r1=225497&r2=225498&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp (original)
> +++ llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp Thu Jan  8 20:48:48 2015
> @@ -2560,7 +2560,7 @@ std::error_code BitcodeReader::ParseFunc
>        I = nullptr;
>        continue;
> 
> -    case bitc::FUNC_CODE_DEBUG_LOC: {      // DEBUG_LOC: [line, col, scope, ia]
> +    case bitc::FUNC_CODE_DEBUG_LOC_OLD: { // DEBUG_LOC_OLD: [line,col,scope,ia]
>        I = nullptr;     // Get the last instruction emitted.
>        if (CurBB && !CurBB->empty())
>          I = &CurBB->back();
> 
> Modified: llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp?rev=225498&r1=225497&r2=225498&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp (original)
> +++ llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp Thu Jan  8 20:48:48 2015
> @@ -1718,7 +1718,7 @@ static void WriteFunction(const Function
>          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, Vals);
> +        Stream.EmitRecord(bitc::FUNC_CODE_DEBUG_LOC_OLD, Vals);
>          Vals.clear();
> 
>          LastDL = DL;
> 
> Modified: llvm/trunk/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp?rev=225498&r1=225497&r2=225498&view=diff
> ==============================================================================
> --- llvm/trunk/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp (original)
> +++ llvm/trunk/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp Thu Jan  8 20:48:48 2015
> @@ -247,7 +247,7 @@ static const char *GetCodeName(unsigned
>      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:         return "DEBUG_LOC";
> +    case bitc::FUNC_CODE_DEBUG_LOC_OLD:     return "DEBUG_LOC_OLD";
>      }
>    case bitc::VALUE_SYMTAB_BLOCK_ID:
>      switch (CodeID) {
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>