[llvm-commits] [llvm] r132533 - in /llvm/trunk/lib/Bitcode: Reader/BitcodeReader.cpp Writer/BitcodeWriter.cpp Writer/ValueEnumerator.cpp Writer/ValueEnumerator.h

[Chad Rosier]

On Jun 2, 2011, at 11:07 PM, Chris Lattner wrote:

> 
> On Jun 2, 2011, at 10:09 PM, Chad Rosier wrote:
> 
>> Author: mcrosier
>> Date: Fri Jun  3 00:09:12 2011
>> New Revision: 132533
>> 
>> URL: http://llvm.org/viewvc/llvm-project?rev=132533&view=rev
>> Log:
>> Whitespace and other cleanup.  Functionallity unchanged.
> 
> Hi Chad,
> 
> FYI, the lowercase function names were intended.  The naming convention (which was only recently adopted, thus the codebase is still not consistent) is described here:
> http://llvm.org/docs/CodingStandards.html#ll_naming
> 

Fixed in revision 132555.

  Chad

> -Chris
> 
> 
>> 
>> Modified:
>>   llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp
>>   llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp
>>   llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.cpp
>>   llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.h
>> 
>> Modified: llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp?rev=132533&r1=132532&r2=132533&view=diff
>> ==============================================================================
>> --- llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp (original)
>> +++ llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp Fri Jun  3 00:09:12 2011
>> @@ -1852,7 +1852,6 @@
>>        FunctionBBs[i] = BasicBlock::Create(Context, "", F);
>>      CurBB = FunctionBBs[0];
>>      continue;
>> -
>> 
>>    case bitc::FUNC_CODE_DEBUG_LOC_AGAIN:  // DEBUG_LOC_AGAIN
>>      // This record indicates that the last instruction is at the same
>> 
>> Modified: llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp?rev=132533&r1=132532&r2=132533&view=diff
>> ==============================================================================
>> --- llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp (original)
>> +++ llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp Fri Jun  3 00:09:12 2011
>> @@ -100,8 +100,6 @@
>>  }
>> }
>> 
>> -
>> -
>> static void WriteStringRecord(unsigned Code, const std::string &Str,
>>                              unsigned AbbrevToUse, BitstreamWriter &Stream) {
>>  SmallVector<unsigned, 64> Vals;
>> @@ -447,7 +445,6 @@
>>    Vals.clear();
>>  }
>> 
>> -
>>  // Emit the alias information.
>>  for (Module::const_alias_iterator AI = M->alias_begin(), E = M->alias_end();
>>       AI != E; ++AI) {
>> @@ -1208,7 +1205,7 @@
>> static void WriteFunction(const Function &F, ValueEnumerator &VE,
>>                          BitstreamWriter &Stream) {
>>  Stream.EnterSubblock(bitc::FUNCTION_BLOCK_ID, 4);
>> -  VE.incorporateFunction(F);
>> +  VE.IncorporateFunction(F);
>> 
>>  SmallVector<unsigned, 64> Vals;
>> 
>> @@ -1272,7 +1269,7 @@
>> 
>>  if (NeedsMetadataAttachment)
>>    WriteMetadataAttachment(F, VE, Stream);
>> -  VE.purgeFunction();
>> +  VE.PurgeFunction();
>>  Stream.ExitBlock();
>> }
>> 
>> @@ -1512,9 +1509,9 @@
>>  WriteModuleMetadata(M, VE, Stream);
>> 
>>  // Emit function bodies.
>> -  for (Module::const_iterator I = M->begin(), E = M->end(); I != E; ++I)
>> -    if (!I->isDeclaration())
>> -      WriteFunction(*I, VE, Stream);
>> +  for (Module::const_iterator F = M->begin(), E = M->end(); F != E; ++F)
>> +    if (!F->isDeclaration())
>> +      WriteFunction(*F, VE, Stream);
>> 
>>  // Emit metadata.
>>  WriteModuleMetadataStore(M, Stream);
>> 
>> Modified: llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.cpp?rev=132533&r1=132532&r2=132533&view=diff
>> ==============================================================================
>> --- llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.cpp (original)
>> +++ llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.cpp Fri Jun  3 00:09:12 2011
>> @@ -452,8 +452,7 @@
>>  }
>> }
>> 
>> -
>> -void ValueEnumerator::incorporateFunction(const Function &F) {
>> +void ValueEnumerator::IncorporateFunction(const Function &F) {
>>  InstructionCount = 0;
>>  NumModuleValues = Values.size();
>>  NumModuleMDValues = MDValues.size();
>> @@ -517,7 +516,7 @@
>>    EnumerateFunctionLocalMetadata(FnLocalMDVector[i]);
>> }
>> 
>> -void ValueEnumerator::purgeFunction() {
>> +void ValueEnumerator::PurgeFunction() {
>>  /// Remove purged values from the ValueMap.
>>  for (unsigned i = NumModuleValues, e = Values.size(); i != e; ++i)
>>    ValueMap.erase(Values[i].first);
>> 
>> Modified: llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.h
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.h?rev=132533&r1=132532&r2=132533&view=diff
>> ==============================================================================
>> --- llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.h (original)
>> +++ llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.h Fri Jun  3 00:09:12 2011
>> @@ -127,11 +127,11 @@
>>  /// should only be used by rare constructs such as address-of-label.
>>  unsigned getGlobalBasicBlockID(const BasicBlock *BB) const;
>> 
>> -  /// incorporateFunction/purgeFunction - If you'd like to deal with a function,
>> +  /// IncorporateFunction/PurgeFunction - If you'd like to deal with a function,
>>  /// use these two methods to get its data into the ValueEnumerator!
>>  ///
>> -  void incorporateFunction(const Function &F);
>> -  void purgeFunction();
>> +  void IncorporateFunction(const Function &F);
>> +  void PurgeFunction();
>> 
>> private:
>>  void OptimizeConstants(unsigned CstStart, unsigned CstEnd);
>> 
>> 
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>