[llvm-commits] [llvm] r73241 - in /llvm/trunk/lib: Transforms/IPO/MergeFunctions.cpp VMCore/Instruction.cpp

[Nick Lewycky]

Dan Gohman wrote:
> Author: djg
> Date: Fri Jun 12 14:03:05 2009
> New Revision: 73241
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=73241&view=rev
> Log:
> Give Instruction::isSameOperationAs a corresponding comment to note
> the relationship with MergeFunctions.cpp's isEquivalentOperation,
> and make a trivial code reordering so that the two functions are
> easier to compare.
> 
> Fix the name of Instruction::isSameOperationAs in MergeFunction.cpp's
> isEquivalentOperation's comment, and fix a nearby 80-column violation.

Thanks Dan!

Nick

> Modified:
>     llvm/trunk/lib/Transforms/IPO/MergeFunctions.cpp
>     llvm/trunk/lib/VMCore/Instruction.cpp
> 
> Modified: llvm/trunk/lib/Transforms/IPO/MergeFunctions.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/MergeFunctions.cpp?rev=73241&r1=73240&r2=73241&view=diff
> 
> ==============================================================================
> --- llvm/trunk/lib/Transforms/IPO/MergeFunctions.cpp (original)
> +++ llvm/trunk/lib/Transforms/IPO/MergeFunctions.cpp Fri Jun 12 14:03:05 2009
> @@ -180,8 +180,9 @@
>  
>  /// isEquivalentOperation - determine whether the two operations are the same
>  /// except that pointer-to-A and pointer-to-B are equivalent. This should be
> -/// kept in sync with Instruction::isSameOperandAs.
> -static bool isEquivalentOperation(const Instruction *I1, const Instruction *I2) {
> +/// kept in sync with Instruction::isSameOperationAs.
> +static bool
> +isEquivalentOperation(const Instruction *I1, const Instruction *I2) {
>    if (I1->getOpcode() != I2->getOpcode() ||
>        I1->getNumOperands() != I2->getNumOperands() ||
>        !isEquivalentType(I1->getType(), I2->getType()))
> 
> Modified: llvm/trunk/lib/VMCore/Instruction.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Instruction.cpp?rev=73241&r1=73240&r2=73241&view=diff
> 
> ==============================================================================
> --- llvm/trunk/lib/VMCore/Instruction.cpp (original)
> +++ llvm/trunk/lib/VMCore/Instruction.cpp Fri Jun 12 14:03:05 2009
> @@ -218,9 +218,12 @@
>  }
>  
>  // isSameOperationAs
> +// This should be kept in sync with isEquivalentOperation in
> +// lib/Transforms/IPO/MergeFunctions.cpp.
>  bool Instruction::isSameOperationAs(const Instruction *I) const {
> -  if (getOpcode() != I->getOpcode() || getType() != I->getType() ||
> -      getNumOperands() != I->getNumOperands())
> +  if (getOpcode() != I->getOpcode() ||
> +      getNumOperands() != I->getNumOperands() ||
> +      getType() != I->getType())
>      return false;
>  
>    // We have two instructions of identical opcode and #operands.  Check to see
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>