address review comments II

improve pointer parameter/result detection

Author: Thorsten Schütt

llvm/lib/CodeGen/MachineVerifier.cpp

@@ -1550,9 +1550,13 @@ void MachineVerifier::verifyPreISelGenericInstruction(const MachineInstr *MI) {
     LLT SrcTy = MRI->getType(MI->getOperand(1).getReg());
     LLT SrcTy2 = MRI->getType(MI->getOperand(2).getReg());
 
-    if (DstTy.isPointerOrPointerVector() || SrcTy.isPointerOrPointerVector() ||
-        SrcTy2.isPointerOrPointerVector()) {
-      report("Generic scmp/ucmp does not support pointers", MI);
+    if (SrcTy.isPointerOrPointerVector() || SrcTy2.isPointerOrPointerVector()) {
+      report("Generic scmp/ucmp does not support pointers as operands", MI);
+      break;
+    }
+
+    if (DstTy.isPointerOrPointerVector()) {
+      report("Generic scmp/ucmp does not support pointers as a result", MI);
       break;
     }
 

llvm/test/MachineVerifier/test_uscmp.mir

@@ -6,15 +6,20 @@ name:            test_uscmp
 body:             |
   bb.0:
 
-    %12:_(p0) = G_IMPLICIT_DEF
-    %13:_(p0) = G_IMPLICIT_DEF
-    ; CHECK: Generic scmp/ucmp does not support pointers
+    %2:_(p0) = G_IMPLICIT_DEF
+    %3:_(p0) = G_IMPLICIT_DEF
+    ; CHECK: Generic scmp/ucmp does not support pointers as operands
+    %4:_(s1) = G_SCMP %2, %3
+
+    %12:_(s64) = G_IMPLICIT_DEF
+    %13:_(s64) = G_IMPLICIT_DEF
+    ; CHECK: Generic scmp/ucmp does not support pointers as a result
     %14:_(p0) = G_SCMP %12, %13
 
-    %3:_(<2 x s32>) = G_IMPLICIT_DEF
-    %4:_(<2 x s32>) = G_IMPLICIT_DEF
+    %23:_(<2 x s32>) = G_IMPLICIT_DEF
+    %24:_(<2 x s32>) = G_IMPLICIT_DEF
     ; CHECK: Generic vector scmp/ucmp must preserve number of lanes
-    %5:_(s1) = G_UCMP  %3, %4
+    %5:_(s1) = G_UCMP  %23, %24
 
     %15:_(s32) = G_CONSTANT i32 0
     %16:_(s64) = G_CONSTANT i64 2