Commit feff932b authored by Tom Stellard's avatar Tom Stellard
Browse files

Merging r312357: 

------------------------------------------------------------------------
r312357 | davide | 2017-09-01 12:54:08 -0700 (Fri, 01 Sep 2017) | 9 lines

[TTI] Fix getGEPCost() for geps with a single operand.

Previously this would sporadically crash as TargetType
was never initialized. We special-case the single-operand
case returning earlier and trying to mimic the behaviour of
isLegalAddressingMode as closely as possible.

Differential Revision:  https://reviews.llvm.org/D37277
------------------------------------------------------------------------

llvm-svn: 315663
parent 7aaddf65

llvm/include/llvm/Analysis/TargetTransformInfoImpl.h

+6 −0
Original line number Diff line number Diff line
@@ -652,6 +652,12 @@ public: 


    auto GTI = gep_type_begin(PointeeType, Operands);

    Type *TargetType;



    // Handle the case where the GEP instruction has a single operand,

    // the basis, therefore TargetType is a nullptr.

    if (Operands.empty())

      return !BaseGV ? TTI::TCC_Free : TTI::TCC_Basic;



    for (auto I = Operands.begin(); I != Operands.end(); ++I, ++GTI) {

      TargetType = GTI.getIndexedType();

      // We assume that the cost of Scalar GEP with constant index and the

llvm/test/Transforms/SimplifyCFG/gepcost.ll

0 → 100644
+28 −0
Original line number Diff line number Diff line 
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py

; RUN: opt < %s -S -simplifycfg | FileCheck %s



target datalayout = "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64"

target triple = "thumbv7m-none--eabi"



@glob = external unnamed_addr constant [16 x i8]



define void @f() {

; CHECK-LABEL: @f(

; CHECK-NEXT:  entr:

; CHECK-NEXT:    br i1 undef, label [[NEXT:%.*]], label [[EXIT:%.*]]

; CHECK:       next:

; CHECK-NEXT:    [[PAT:%.*]] = getelementptr [16 x i8], [16 x i8]* @glob

; CHECK-NEXT:    br label [[EXIT]]

; CHECK:       exit:

; CHECK-NEXT:    ret void

;

entr:

  br i1 undef, label %next, label %exit



next:

  %pat = getelementptr [16 x i8], [16 x i8]* @glob

  br label %exit



exit:

  ret void

}