Merge commit '2b58458225fb' from llvm.org/main into next

Author: git apple-llvm automerger

llvm/lib/CodeGen/MIRParser/MILexer.cpp

@@ -726,7 +726,7 @@ StringRef llvm::lexMIToken(StringRef Source, MIToken &Token,
     return C.remaining();
   }
 
-  C = skipMachineOperandComment(C);
+  C = skipWhitespace(skipMachineOperandComment(C));
 
   if (Cursor R = maybeLexMachineBasicBlock(C, Token, ErrorCallback))
     return R.remaining();

llvm/test/CodeGen/MIR/skip-mir-comment-trailing-whitespace.mir

@@ -0,0 +1,17 @@
+# RUN: llc %s -mtriple=riscv64 -mattr=+v -run-pass=none -o - | FileCheck %s
+
+---
+name:            test_vse8
+tracksRegLiveness: true
+body:             |
+  bb.0:
+    ; CHECK-LABEL: name: test_vse8{{$}}
+    ; CHECK: PseudoVSE8_V_MF8 %1, %2, %0, 3 /* e8 */ :: (store unknown-size, align 1)
+    liveins: $x10, $v8, $x11
+
+    %0:gprnox0 = COPY $x11
+    %1:vr = COPY $v8
+    %2:gpr = COPY $x10
+    PseudoVSE8_V_MF8 %1, %2, %0, 3 /* e8 */ :: (store unknown-size, align 1)
+    PseudoRET
+...