[PATCH] D45355: [SelectionDAG] Fix return calling convention in expansion of ?MULO

[whitequark via Phabricator via llvm-commits]

whitequark updated this revision to Diff 186404.
whitequark added a comment.

Addressed review


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D45355/new/

https://reviews.llvm.org/D45355

Files:
  lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
  test/CodeGen/Thumb/umulo-32-legalisation-lowering.ll


Index: test/CodeGen/Thumb/umulo-32-legalisation-lowering.ll
===================================================================
--- /dev/null
+++ test/CodeGen/Thumb/umulo-32-legalisation-lowering.ll
@@ -0,0 +1,43 @@
+; RUN: llc < %s -mtriple=thumb-eabi   | FileCheck %s --check-prefixes CHECK,CHECK-LITTLE
+; RUN: llc < %s -mtriple=thumbeb-eabi | FileCheck %s --check-prefixes CHECK,CHECK-BIG
+
+define i1 @umulo32(i32 %l, i32 %r) unnamed_addr #0 {
+; CHECK-LABEL: umulo32:
+; CHECK:                @ %bb.0: @ %start
+; CHECK-NEXT:           .save {r7, lr}
+; CHECK-NEXT:           push {r7, lr}
+; CHECK-LITTLE-NEXT:    movs r2, r1
+; CHECK-LITTLE-NEXT:    movs r1, #0
+; CHECK-NEXT:           movs r3, r1
+; CHECK-BIG-NEXT:       movs r1, r0
+; CHECK-BIG-NEXT:       movs r0, #0
+; CHECK-BIG-NEXT:       movs r2, r0
+; CHECK-NEXT:           bl __aeabi_lmul
+; CHECK-LITTLE-NEXT:    cmp  r1, #0
+; CHECK-LITTLE-NEXT:    bne  .LBB0_2
+; CHECK-LITTLE-NEXT:    @ %bb.1:
+; CHECK-LITTLE-NEXT:    movs r0, r1
+; CHECK-LITTLE-NEXT:    b    .LBB0_3
+; CHECK-LITTLE-NEXT:    .LBB0_2:
+; CHECK-LITTLE-NEXT:    movs r0, #1
+; CHECK-LITTLE-NEXT:    .LBB0_3:
+; CHECK-BIG-NEXT:       cmp  r0, #0
+; CHECK-BIG-NEXT:       beq  .LBB0_2
+; CHECK-BIG-NEXT:       @ %bb.1:
+; CHECK-BIG-NEXT:       movs r0, #1
+; CHECK-BIG-NEXT:       .LBB0_2:
+; CHECK-NEXT:           pop {r7}
+; CHECK-NEXT:           pop {r1}
+; CHECK-NEXT:           bx r1
+start:
+  %0 = tail call { i32, i1 } @llvm.umul.with.overflow.i32(i32 %l, i32 %r) #2
+  %1 = extractvalue { i32, i1 } %0, 1
+  ret i1 %1
+}
+
+; Function Attrs: nounwind readnone speculatable
+declare { i32, i1 } @llvm.umul.with.overflow.i32(i32, i32) #1
+
+attributes #0 = { nounwind readnone uwtable }
+attributes #1 = { nounwind readnone speculatable }
+attributes #2 = { nounwind }
Index: lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
===================================================================
--- lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
+++ lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
@@ -3423,7 +3423,7 @@
       // being a legal type for the architecture and thus has to be split to
       // two arguments.
       SDValue Ret;
-      if(DAG.getDataLayout().isLittleEndian()) {
+      if (DAG.getDataLayout().isLittleEndian()) {
         // Halves of WideVT are packed into registers in different order
         // depending on platform endianness. This is usually handled by
         // the C calling convention, but we can't defer to it in
@@ -3436,8 +3436,14 @@
       }
       assert(Ret.getOpcode() == ISD::MERGE_VALUES &&
              "Ret value is a collection of constituent nodes holding result.");
-      BottomHalf = Ret.getOperand(0);
-      TopHalf = Ret.getOperand(1);
+      if (DAG.getDataLayout().isLittleEndian()) {
+        // Same as above.
+        BottomHalf = Ret.getOperand(0);
+        TopHalf = Ret.getOperand(1);
+      } else {
+        BottomHalf = Ret.getOperand(1);
+        TopHalf = Ret.getOperand(0);
+      }
     }
 
     if (isSigned) {


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D45355.186404.patch
Type: text/x-patch
Size: 3012 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190212/1c6b4ce8/attachment.bin>