From e8e4ef102df2ef3cce07e44e2ca34d80c7287f17 Mon Sep 17 00:00:00 2001
From: Akira Hatanaka <ahatanaka@mips.com>
Date: Fri, 24 Aug 2012 20:21:49 +0000
Subject: [PATCH] In MipsDAGToDAGISel::SelectAddr, fold add node into address
 operand, if its second operand is MipsISD::GPRel.

llvm-svn: 162584
---
 llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp          | 5 +++--
 llvm/test/CodeGen/Mips/small-section-reserve-gp.ll | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp b/llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp
index 5a97c17ec851..4205223923e3 100644
--- a/llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp
+++ b/llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp
@@ -337,8 +337,9 @@ SelectAddr(SDNode *Parent, SDValue Addr, SDValue &Base, SDValue &Offset) {
     // Generate:
     //  lui $2, %hi($CPI1_0)
     //  lwc1 $f0, %lo($CPI1_0)($2)
-    if (Addr.getOperand(1).getOpcode() == MipsISD::Lo) {
-      SDValue LoVal = Addr.getOperand(1), Opnd0 = LoVal.getOperand(0);
+    if (Addr.getOperand(1).getOpcode() == MipsISD::Lo ||
+        Addr.getOperand(1).getOpcode() == MipsISD::GPRel) {
+      SDValue Opnd0 = Addr.getOperand(1).getOperand(0);
       if (isa<ConstantPoolSDNode>(Opnd0) || isa<GlobalAddressSDNode>(Opnd0) ||
           isa<JumpTableSDNode>(Opnd0)) {
         Base = Addr.getOperand(0);
diff --git a/llvm/test/CodeGen/Mips/small-section-reserve-gp.ll b/llvm/test/CodeGen/Mips/small-section-reserve-gp.ll
index fc251cb61277..03503fb2ae18 100644
--- a/llvm/test/CodeGen/Mips/small-section-reserve-gp.ll
+++ b/llvm/test/CodeGen/Mips/small-section-reserve-gp.ll
@@ -5,7 +5,7 @@
 
 define i32 @geti() nounwind readonly {
 entry:
-; CHECK: addiu ${{[0-9]+}}, $gp, %gp_rel(i)
+; CHECK: lw ${{[0-9]+}}, %gp_rel(i)($gp)
   %0 = load i32* @i, align 4
   ret i32 %0
 }
-- 
GitLab