Rename getAnyLoad to getLoad is suggested by Evan.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@48914 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/CodeGen/SelectionDAG.h b/include/llvm/CodeGen/SelectionDAG.h
index d0e03d4..a77f854 100644 (file)
--- a/include/llvm/CodeGen/SelectionDAG.h
+++ b/include/llvm/CodeGen/SelectionDAG.h
@@ -379,11 +379,11 @@ public:
                        unsigned Alignment=0);
   SDOperand getIndexedLoad(SDOperand OrigLoad, SDOperand Base,
                            SDOperand Offset, ISD::MemIndexedMode AM);
-  SDOperand getAnyLoad(ISD::MemIndexedMode AM, ISD::LoadExtType ExtType,
-                       MVT::ValueType VT, SDOperand Chain,
-                       SDOperand Ptr, SDOperand Offset,
-                       const Value *SV, int SVOffset, MVT::ValueType EVT,
-                       bool isVolatile=false, unsigned Alignment=0);
+  SDOperand getLoad(ISD::MemIndexedMode AM, ISD::LoadExtType ExtType,
+                    MVT::ValueType VT, SDOperand Chain,
+                    SDOperand Ptr, SDOperand Offset,
+                    const Value *SV, int SVOffset, MVT::ValueType EVT,
+                    bool isVolatile=false, unsigned Alignment=0);
 
   /// getStore - Helper function to build ISD::STORE nodes.
   ///

diff --git a/lib/CodeGen/SelectionDAG/LegalizeTypesFloatToInt.cpp b/lib/CodeGen/SelectionDAG/LegalizeTypesFloatToInt.cpp
index 3c98898..50410ef 100644 (file)
--- a/lib/CodeGen/SelectionDAG/LegalizeTypesFloatToInt.cpp
+++ b/lib/CodeGen/SelectionDAG/LegalizeTypesFloatToInt.cpp
@@ -116,10 +116,10 @@ SDOperand DAGTypeLegalizer::FloatToIntRes_LOAD(SDNode *N) {
   MVT::ValueType NVT = TLI.getTypeToTransformTo(N->getValueType(0));
   LoadSDNode *L = cast<LoadSDNode>(N);
 
-  return DAG.getAnyLoad(L->getAddressingMode(), L->getExtensionType(),
-                        NVT, L->getChain(), L->getBasePtr(), L->getOffset(),
-                        L->getSrcValue(), L->getSrcValueOffset(),
-                        L->getMemoryVT(), L->isVolatile(), L->getAlignment());
+  return DAG.getLoad(L->getAddressingMode(), L->getExtensionType(),
+                     NVT, L->getChain(), L->getBasePtr(), L->getOffset(),
+                     L->getSrcValue(), L->getSrcValueOffset(),
+                     L->getMemoryVT(), L->isVolatile(), L->getAlignment());
 }
 
 

diff --git a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
index d39773e..1a12432 100644 (file)
--- a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
@@ -2448,11 +2448,11 @@ SDOperand SelectionDAG::getAtomic(unsigned Opcode, SDOperand Chain,
 }
 
 SDOperand
-SelectionDAG::getAnyLoad(ISD::MemIndexedMode AM, ISD::LoadExtType ExtType,
-                         MVT::ValueType VT, SDOperand Chain,
-                         SDOperand Ptr, SDOperand Offset,
-                         const Value *SV, int SVOffset, MVT::ValueType EVT,
-                         bool isVolatile, unsigned Alignment) {
+SelectionDAG::getLoad(ISD::MemIndexedMode AM, ISD::LoadExtType ExtType,
+                      MVT::ValueType VT, SDOperand Chain,
+                      SDOperand Ptr, SDOperand Offset,
+                      const Value *SV, int SVOffset, MVT::ValueType EVT,
+                      bool isVolatile, unsigned Alignment) {
   if (Alignment == 0) { // Ensure that codegen never sees alignment 0
     const Type *Ty = 0;
     if (VT != MVT::iPTR) {
@@ -2512,8 +2512,8 @@ SDOperand SelectionDAG::getLoad(MVT::ValueType VT,
                                 const Value *SV, int SVOffset,
                                 bool isVolatile, unsigned Alignment) {
   SDOperand Undef = getNode(ISD::UNDEF, Ptr.getValueType());
-  return getAnyLoad(ISD::UNINDEXED, ISD::NON_EXTLOAD, VT, Chain, Ptr, Undef,
-                    SV, SVOffset, VT, isVolatile, Alignment);
+  return getLoad(ISD::UNINDEXED, ISD::NON_EXTLOAD, VT, Chain, Ptr, Undef,
+                 SV, SVOffset, VT, isVolatile, Alignment);
 }
 
 SDOperand SelectionDAG::getExtLoad(ISD::LoadExtType ExtType, MVT::ValueType VT,
@@ -2522,8 +2522,8 @@ SDOperand SelectionDAG::getExtLoad(ISD::LoadExtType ExtType, MVT::ValueType VT,
                                    int SVOffset, MVT::ValueType EVT,
                                    bool isVolatile, unsigned Alignment) {
   SDOperand Undef = getNode(ISD::UNDEF, Ptr.getValueType());
-  return getAnyLoad(ISD::UNINDEXED, ExtType, VT, Chain, Ptr, Undef,
-                    SV, SVOffset, EVT, isVolatile, Alignment);
+  return getLoad(ISD::UNINDEXED, ExtType, VT, Chain, Ptr, Undef,
+                 SV, SVOffset, EVT, isVolatile, Alignment);
 }
 
 SDOperand
@@ -2532,10 +2532,10 @@ SelectionDAG::getIndexedLoad(SDOperand OrigLoad, SDOperand Base,
   LoadSDNode *LD = cast<LoadSDNode>(OrigLoad);
   assert(LD->getOffset().getOpcode() == ISD::UNDEF &&
          "Load is already a indexed load!");
-  return getAnyLoad(AM, LD->getExtensionType(), OrigLoad.getValueType(),
-                    LD->getChain(), Base, Offset, LD->getSrcValue(),
-                    LD->getSrcValueOffset(), LD->getMemoryVT(),
-                    LD->isVolatile(), LD->getAlignment());
+  return getLoad(AM, LD->getExtensionType(), OrigLoad.getValueType(),
+                 LD->getChain(), Base, Offset, LD->getSrcValue(),
+                 LD->getSrcValueOffset(), LD->getMemoryVT(),
+                 LD->isVolatile(), LD->getAlignment());
 }
 
 SDOperand SelectionDAG::getStore(SDOperand Chain, SDOperand Val,