diff options
| -rw-r--r-- | include/llvm/CodeGen/SelectionDAGNodes.h | 2 | ||||
| -rw-r--r-- | lib/CodeGen/SelectionDAG/SelectionDAG.cpp | 7 | ||||
| -rw-r--r-- | lib/Target/PIC16/PIC16ISelLowering.cpp | 3 |
3 files changed, 10 insertions, 2 deletions
diff --git a/include/llvm/CodeGen/SelectionDAGNodes.h b/include/llvm/CodeGen/SelectionDAGNodes.h index 3fb34c1..34d877a 100644 --- a/include/llvm/CodeGen/SelectionDAGNodes.h +++ b/include/llvm/CodeGen/SelectionDAGNodes.h @@ -1814,6 +1814,8 @@ public: GlobalValue *getGlobal() const { return TheGlobal; } int64_t getOffset() const { return Offset; } + // Return the address space this GlobalAddress belongs to. + unsigned getAddressSpace() const; static bool classof(const GlobalAddressSDNode *) { return true; } static bool classof(const SDNode *N) { diff --git a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp index 7c9a001..1c85e9d 100644 --- a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp +++ b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp @@ -5649,6 +5649,13 @@ void SDNode::dumpr() const { DumpNodesr(errs(), this, 0, 0, once); } + +// getAddressSpace - Return the address space this GlobalAddress belongs to. +unsigned GlobalAddressSDNode::getAddressSpace() const { + return getGlobal()->getType()->getAddressSpace(); +} + + const Type *ConstantPoolSDNode::getType() const { if (isMachineConstantPoolEntry()) return Val.MachineCPVal->getType(); diff --git a/lib/Target/PIC16/PIC16ISelLowering.cpp b/lib/Target/PIC16/PIC16ISelLowering.cpp index 87753f9..b817d05 100644 --- a/lib/Target/PIC16/PIC16ISelLowering.cpp +++ b/lib/Target/PIC16/PIC16ISelLowering.cpp @@ -483,9 +483,8 @@ bool PIC16TargetLowering::isRomAddress(const SDValue &Op) { // It is BUILD_PAIR((PIC16Lo TGA), (PIC16Hi TGA)) and Op is BUILD_PAIR SDValue TGA = Op.getOperand(0).getOperand(0); GlobalAddressSDNode *GSDN = dyn_cast<GlobalAddressSDNode>(TGA); - int AddrSpace = GSDN->getGlobal()->getType()->getAddressSpace(); - if (AddrSpace == PIC16ISD::ROM_SPACE) + if (GSDN->getAddressSpace() == PIC16ISD::ROM_SPACE) return true; // Any other address space return it false |