[llvm-commits] [llvm] r93165 - in /llvm/trunk/lib: Bitcode/Reader/BitcodeReader.cpp CodeGen/AsmPrinter/DwarfDebug.cpp

[Devang Patel]

On Jan 11, 2010, at 10:52 AM, Devang Patel wrote:

> Author: dpatel
> Date: Mon Jan 11 12:52:33 2010
> New Revision: 93165
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=93165&view=rev
> Log:
> s/NextValueNo/NextMDValueNo while processing metadata.
> 
> Modified:
>    llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp
>    llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp

hmm... DwarfDebug.cpp changes were unintentional here. Reverted in  r93832.
-
Devang

> 
> Modified: llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp?rev=93165&r1=93164&r2=93165&view=diff
> 
> ==============================================================================
> --- llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp (original)
> +++ llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp Mon Jan 11 12:52:33 2010
> @@ -737,7 +737,7 @@
> }
> 
> bool BitcodeReader::ParseMetadata() {
> -  unsigned NextValueNo = MDValueList.size();
> +  unsigned NextMDValueNo = MDValueList.size();
> 
>   if (Stream.EnterSubBlock(bitc::METADATA_BLOCK_ID))
>     return Error("Malformed block record");
> @@ -801,8 +801,7 @@
>       }
>       Value *V = NamedMDNode::Create(Context, Name.str(), Elts.data(),
>                                      Elts.size(), TheModule);
> -      // FIXME: This shouldn't poke NextValueNo?
> -      MDValueList.AssignValue(V, NextValueNo++);
> +      MDValueList.AssignValue(V, NextMDValueNo++);
>       break;
>     }
>     case bitc::METADATA_FN_NODE:
> @@ -826,7 +825,7 @@
>       Value *V = MDNode::getWhenValsUnresolved(Context, &Elts[0], Elts.size(),
>                                                IsFunctionLocal);
>       IsFunctionLocal = false;
> -      MDValueList.AssignValue(V, NextValueNo++);
> +      MDValueList.AssignValue(V, NextMDValueNo++);
>       break;
>     }
>     case bitc::METADATA_STRING: {
> @@ -837,7 +836,7 @@
>         String[i] = Record[i];
>       Value *V = MDString::get(Context,
>                                StringRef(String.data(), String.size()));
> -      MDValueList.AssignValue(V, NextValueNo++);
> +      MDValueList.AssignValue(V, NextMDValueNo++);
>       break;
>     }
>     case bitc::METADATA_KIND: {
> 
> Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp?rev=93165&r1=93164&r2=93165&view=diff
> 
> ==============================================================================
> --- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp (original)
> +++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp Mon Jan 11 12:52:33 2010
> @@ -2138,13 +2138,14 @@
>   }
> 
>   // Clear debug info
> -  CurrentFnDbgScope = NULL;
> -  DbgScopeMap.clear();
> -  DbgScopeBeginMap.clear();
> -  DbgScopeEndMap.clear();
> -  ConcreteScopes.clear();
> -  AbstractScopesList.clear();
> -
> +  if (CurrentFnDbgScope) {
> +    CurrentFnDbgScope = NULL;
> +    DbgScopeMap.clear();
> +    DbgScopeBeginMap.clear();
> +    DbgScopeEndMap.clear();
> +    ConcreteScopes.clear();
> +    AbstractScopesList.clear();
> +  }
>   Lines.clear();
> 
>   if (TimePassesIsEnabled)
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits