[llvm-commits] [llvm] r79133 - in /llvm/trunk/lib/CodeGen/SelectionDAG: LegalizeDAG.cpp SelectionDAG.cpp TargetLowering.cpp

[Evan Cheng]

Yes it's good. Sorry about the breakage.

Evan

On Aug 15, 2009, at 1:46 PM, Benjamin Kramer  
<benny.kra at googlemail.com> wrote:

> Author: d0k
> Date: Sat Aug 15 15:46:16 2009
> New Revision: 79133
>
> URL: http://llvm.org/viewvc/llvm-project?rev=79133&view=rev
> Log:
> Unbreak build. Evan, please make sure my changes are correct.
>
> Modified:
>    llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
>    llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
>    llvm/trunk/lib/CodeGen/SelectionDAG/TargetLowering.cpp
>
> Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp?rev=79133&r1=79132&r2=79133&view=diff
>
> === 
> === 
> === 
> =====================================================================
> --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp (original)
> +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp Sat Aug 15  
> 15:46:16 2009
> @@ -1069,7 +1069,7 @@
>       case TargetLowering::Legal:
>         // If this is an unaligned load and the target doesn't  
> support it,
>         // expand it.
> -        if (!TLI.allowsUnalignedMemoryAccesses()) {
> +        if (!TLI.allowsUnalignedMemoryAccesses(LD->getMemoryVT())) {
>           const Type *Ty = LD->getMemoryVT().getTypeForEVT 
> (*DAG.getContext());
>           unsigned ABIAlignment = TLI.getTargetData()- 
> >getABITypeAlignment(Ty);
>           if (LD->getAlignment() < ABIAlignment){
> @@ -1252,7 +1252,7 @@
>           } else {
>             // If this is an unaligned load and the target doesn't  
> support it,
>             // expand it.
> -            if (!TLI.allowsUnalignedMemoryAccesses()) {
> +            if (!TLI.allowsUnalignedMemoryAccesses(LD->getMemoryVT 
> ())) {
>               const Type *Ty = LD->getMemoryVT().getTypeForEVT 
> (*DAG.getContext());
>               unsigned ABIAlignment = TLI.getTargetData()- 
> >getABITypeAlignment(Ty);
>               if (LD->getAlignment() < ABIAlignment){
> @@ -1330,7 +1330,7 @@
>         case TargetLowering::Legal:
>           // If this is an unaligned store and the target doesn't  
> support it,
>           // expand it.
> -          if (!TLI.allowsUnalignedMemoryAccesses()) {
> +          if (!TLI.allowsUnalignedMemoryAccesses(ST->getMemoryVT 
> ())) {
>             const Type *Ty = ST->getMemoryVT().getTypeForEVT 
> (*DAG.getContext());
>             unsigned ABIAlignment = TLI.getTargetData()- 
> >getABITypeAlignment(Ty);
>             if (ST->getAlignment() < ABIAlignment)
> @@ -1429,7 +1429,7 @@
>         case TargetLowering::Legal:
>           // If this is an unaligned store and the target doesn't  
> support it,
>           // expand it.
> -          if (!TLI.allowsUnalignedMemoryAccesses()) {
> +          if (!TLI.allowsUnalignedMemoryAccesses(ST->getMemoryVT 
> ())) {
>             const Type *Ty = ST->getMemoryVT().getTypeForEVT 
> (*DAG.getContext());
>             unsigned ABIAlignment = TLI.getTargetData()- 
> >getABITypeAlignment(Ty);
>             if (ST->getAlignment() < ABIAlignment)
>
> Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp?rev=79133&r1=79132&r2=79133&view=diff
>
> === 
> === 
> === 
> =====================================================================
> --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp (original)
> +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp Sat Aug 15  
> 15:46:16 2009
> @@ -3105,8 +3105,8 @@
>                               const TargetLowering &TLI) {
>   isSrcStr = isMemSrcFromString(Src, Str);
>   bool isSrcConst = isa<ConstantSDNode>(Src);
> -  bool AllowUnalign = TLI.allowsUnalignedMemoryAccesses();
>   EVT VT = TLI.getOptimalMemOpType(Size, Align, isSrcConst,  
> isSrcStr, DAG);
> +  bool AllowUnalign = TLI.allowsUnalignedMemoryAccesses(VT);
>   if (VT != MVT::iAny) {
>     unsigned NewAlign = (unsigned)
>       TLI.getTargetData()->getABITypeAlignment(
>
> Modified: llvm/trunk/lib/CodeGen/SelectionDAG/TargetLowering.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/TargetLowering.cpp?rev=79133&r1=79132&r2=79133&view=diff
>
> === 
> === 
> === 
> =====================================================================
> --- llvm/trunk/lib/CodeGen/SelectionDAG/TargetLowering.cpp (original)
> +++ llvm/trunk/lib/CodeGen/SelectionDAG/TargetLowering.cpp Sat Aug  
> 15 15:46:16 2009
> @@ -508,7 +508,6 @@
>   memset(RegClassForVT, 0,MVT::LAST_VALUETYPE*sizeof 
> (TargetRegisterClass*));
>   memset(TargetDAGCombineArray, 0, array_lengthof 
> (TargetDAGCombineArray));
>   maxStoresPerMemset = maxStoresPerMemcpy = maxStoresPerMemmove = 8;
> -  allowUnalignedMemoryAccesses = false;
>   benefitFromCodePlacementOpt = false;
>   UseUnderscoreSetJmp = false;
>   UseUnderscoreLongJmp = false;
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits