Re-apply "r351584: "GlobalISel: Verify g_zextload and g_sextload""

I reverted it originally due to a bot failing. The underlying bug has been fixed
as of r352311.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@352312 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/MachineVerifier.cpp b/lib/CodeGen/MachineVerifier.cpp
index ad7825ba3eb4faf90150c9328fd7ab44f72ee65f..879a3d33469ce7d3133031b0cf83f924e8216a22 100644 (file)
--- a/lib/CodeGen/MachineVerifier.cpp
+++ b/lib/CodeGen/MachineVerifier.cpp
@@ -1002,11 +1002,24 @@ void MachineVerifier::visitMachineInstrBefore(const MachineInstr *MI) {
   }
   case TargetOpcode::G_LOAD:
   case TargetOpcode::G_STORE:
+  case TargetOpcode::G_ZEXTLOAD:
+  case TargetOpcode::G_SEXTLOAD:
     // Generic loads and stores must have a single MachineMemOperand
     // describing that access.
-    if (!MI->hasOneMemOperand())
+    if (!MI->hasOneMemOperand()) {
       report("Generic instruction accessing memory must have one mem operand",
              MI);
+    } else {
+      if (MI->getOpcode() == TargetOpcode::G_ZEXTLOAD ||
+          MI->getOpcode() == TargetOpcode::G_SEXTLOAD) {
+        const MachineMemOperand &MMO = **MI->memoperands_begin();
+        LLT DstTy = MRI->getType(MI->getOperand(0).getReg());
+        if (MMO.getSize() * 8 >= DstTy.getSizeInBits()) {
+          report("Generic extload must have a narrower memory type", MI);
+        }
+      }
+    }
+
     break;
   case TargetOpcode::G_PHI: {
     LLT DstTy = MRI->getType(MI->getOperand(0).getReg());

diff --git a/test/CodeGen/MIR/AArch64/invalid-extload.mir b/test/CodeGen/MIR/AArch64/invalid-extload.mir
new file mode 100644 (file)
index 0000000..cce2639
--- /dev/null
+++ b/test/CodeGen/MIR/AArch64/invalid-extload.mir
@@ -0,0 +1,23 @@
+# RUN: not llc -mtriple=aarch64-none-linux-gnu -run-pass none -o - %s 2>&1 | FileCheck %s
+
+# CHECK: *** Bad machine code: Generic extload must have a narrower memory type ***
+# CHECK: *** Bad machine code: Generic extload must have a narrower memory type ***
+# CHECK: *** Bad machine code: Generic extload must have a narrower memory type ***
+# CHECK: *** Bad machine code: Generic extload must have a narrower memory type ***
+# CHECK: *** Bad machine code: Generic instruction accessing memory must have one mem operand ***
+# CHECK: *** Bad machine code: Generic instruction accessing memory must have one mem operand ***
+
+---
+name: invalid_extload_memory_sizes
+body: |
+  bb.0:
+
+    %0:_(p0) = COPY $x0
+    %1:_(s64) = G_ZEXTLOAD %0(p0) :: (load 8)
+    %2:_(s64) = G_ZEXTLOAD %0(p0) :: (load 16)
+    %3:_(s64) = G_SEXTLOAD %0(p0) :: (load 8)
+    %4:_(s64) = G_SEXTLOAD %0(p0) :: (load 16)
+    %5:_(s64) = G_ZEXTLOAD %0(p0)
+    %6:_(s64) = G_SEXTLOAD %0(p0)
+
+...