[llvm] 43d239d - [GlobalISel] Fix incorrect setting of ValNo when splitting

[Mikael Holmen via llvm-commits]

Author: Gabriel Hjort Åkerlund
Date: 2020-09-30T16:08:51+02:00
New Revision: 43d239d0fadb1f8ea297580ca39dfbee96c913c1

URL: https://github.com/llvm/llvm-project/commit/43d239d0fadb1f8ea297580ca39dfbee96c913c1
DIFF: https://github.com/llvm/llvm-project/commit/43d239d0fadb1f8ea297580ca39dfbee96c913c1.diff

LOG: [GlobalISel] Fix incorrect setting of ValNo when splitting

Before, for each original argument i, ValNo was set to i + PartIdx, but
ValNo is intended to reflect the index of the value before splitting.
Hence, ValNo should always be set to i and not consider the PartIdx.

Reviewed By: arsenm

Differential Revision: https://reviews.llvm.org/D86511

Added: 
    

Modified: 
    llvm/lib/CodeGen/GlobalISel/CallLowering.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/CodeGen/GlobalISel/CallLowering.cpp b/llvm/lib/CodeGen/GlobalISel/CallLowering.cpp
index 49d101a81e93..2e2cb575a4b9 100644
--- a/llvm/lib/CodeGen/GlobalISel/CallLowering.cpp
+++ b/llvm/lib/CodeGen/GlobalISel/CallLowering.cpp
@@ -285,7 +285,7 @@ bool CallLowering::handleAssignments(CCState &CCInfo,
           }
           Args[i].Regs.push_back(Reg);
           Args[i].Flags.push_back(Flags);
-          if (Handler.assignArg(i + Part, NewVT, NewVT, CCValAssign::Full,
+          if (Handler.assignArg(i, NewVT, NewVT, CCValAssign::Full,
                                 Args[i], Args[i].Flags[Part], CCInfo)) {
             // Still couldn't assign this smaller part type for some reason.
             return false;
@@ -318,7 +318,7 @@ bool CallLowering::handleAssignments(CCState &CCInfo,
         }
         Args[i].Regs.push_back(Unmerge.getReg(PartIdx));
         Args[i].Flags.push_back(Flags);
-        if (Handler.assignArg(i + PartIdx, NewVT, NewVT, CCValAssign::Full,
+        if (Handler.assignArg(i, NewVT, NewVT, CCValAssign::Full,
                               Args[i], Args[i].Flags[PartIdx], CCInfo))
           return false;
       }