Rebasing

Change-Id: Iad0539e526fb0fc116217dcbd033f8297fa5ef5f

Author: nasherm

llvm/lib/Analysis/TargetTransformInfo.cpp

@@ -1381,9 +1381,6 @@ bool TargetTransformInfo::isProfitableToSinkOperands(
 
 bool TargetTransformInfo::isVectorShiftByScalarCheap(Type *Ty) const {
   return TTIImpl->isVectorShiftByScalarCheap(Ty);
-
-bool TargetTransformInfo::useWidenGlobalStrings() const {
-  return TTIImpl->useWidenGlobalStrings();
 }
 
 unsigned

llvm/lib/Target/ARM/ARMTargetTransformInfo.cpp

@@ -2664,7 +2664,6 @@ bool ARMTTIImpl::hasArmWideBranch(bool Thumb) const {
   }
 }
 
-<<<<<<< HEAD
 /// Check if Ext1 and Ext2 are extends of the same type, doubling the bitwidth
 /// of the vector elements.
 static bool areExtractExts(Value *Ext1, Value *Ext2) {
@@ -2811,8 +2810,6 @@ bool ARMTTIImpl::isProfitableToSinkOperands(Instruction *I,
   return true;
 }
 
-bool ARMTTIImpl::useWidenGlobalStrings() const { return UseWidenGlobalStrings; }
-
 unsigned ARMTTIImpl::getNumBytesToPadGlobalArray(unsigned Size,
                                                  Type *ArrayType) const {
   if (!UseWidenGlobalArrays) {

llvm/lib/Target/ARM/ARMTargetTransformInfo.h

@@ -338,8 +338,6 @@ class ARMTTIImpl : public BasicTTIImplBase<ARMTTIImpl> {
   bool isProfitableToSinkOperands(Instruction *I,
                                   SmallVectorImpl<Use *> &Ops) const;
 
-  bool useWidenGlobalStrings() const;
-
   unsigned getNumBytesToPadGlobalArray(unsigned Size, Type *ArrayType) const;
 
   /// @}