Merge commit '7ada6f111f13' from llvm.org/main into next

Author: git apple-llvm automerger

llvm/lib/MC/MCParser/AsmParser.cpp

@@ -5224,37 +5224,43 @@ bool AsmParser::parseDirectiveIfc(SMLoc DirectiveLoc, bool ExpectEqual) {
 /// parseDirectiveIfeqs
 ///   ::= .ifeqs string1, string2
 bool AsmParser::parseDirectiveIfeqs(SMLoc DirectiveLoc, bool ExpectEqual) {
-  if (Lexer.isNot(AsmToken::String)) {
-    if (ExpectEqual)
-      return TokError("expected string parameter for '.ifeqs' directive");
-    return TokError("expected string parameter for '.ifnes' directive");
-  }
+  TheCondStack.push_back(TheCondState);
+  TheCondState.TheCond = AsmCond::IfCond;
 
-  StringRef String1 = getTok().getStringContents();
-  Lex();
+  if (TheCondState.Ignore) {
+    eatToEndOfStatement();
+  } else {
+    if (Lexer.isNot(AsmToken::String)) {
+      if (ExpectEqual)
+        return TokError("expected string parameter for '.ifeqs' directive");
+      return TokError("expected string parameter for '.ifnes' directive");
+    }
 
-  if (Lexer.isNot(AsmToken::Comma)) {
-    if (ExpectEqual)
+    StringRef String1 = getTok().getStringContents();
+    Lex();
+
+    if (Lexer.isNot(AsmToken::Comma)) {
+      if (ExpectEqual)
+        return TokError(
+            "expected comma after first string for '.ifeqs' directive");
       return TokError(
-          "expected comma after first string for '.ifeqs' directive");
-    return TokError("expected comma after first string for '.ifnes' directive");
-  }
+          "expected comma after first string for '.ifnes' directive");
+    }
 
-  Lex();
+    Lex();
 
-  if (Lexer.isNot(AsmToken::String)) {
-    if (ExpectEqual)
-      return TokError("expected string parameter for '.ifeqs' directive");
-    return TokError("expected string parameter for '.ifnes' directive");
-  }
+    if (Lexer.isNot(AsmToken::String)) {
+      if (ExpectEqual)
+        return TokError("expected string parameter for '.ifeqs' directive");
+      return TokError("expected string parameter for '.ifnes' directive");
+    }
 
-  StringRef String2 = getTok().getStringContents();
-  Lex();
+    StringRef String2 = getTok().getStringContents();
+    Lex();
 
-  TheCondStack.push_back(TheCondState);
-  TheCondState.TheCond = AsmCond::IfCond;
-  TheCondState.CondMet = ExpectEqual == (String1 == String2);
-  TheCondState.Ignore = !TheCondState.CondMet;
+    TheCondState.CondMet = ExpectEqual == (String1 == String2);
+    TheCondState.Ignore = !TheCondState.CondMet;
+  }
 
   return false;
 }

llvm/test/MC/AsmParser/ifeqs.s

@@ -18,3 +18,14 @@
 // CHECK-NOT: .byte 0
 // CHECK: .byte 1
 
+
+.if 0
+  .ifeqs "alpha", "alpha"
+    .byte 2
+  .else
+    .byte 3
+  .endif
+.endif
+
+// CHECK-NOT: .byte 2
+// CHECK-NOT: .byte 3

llvm/test/MC/AsmParser/ifnes.s

@@ -20,3 +20,13 @@
 # CHECK: .byte 1
 .ifnes "equal", "equal" ; .byte 0 ; .else ; .byte 1 ; .endif
 
+.if 0
+  .ifnes "alpha", "alpha"
+    .byte 2
+  .else
+    .byte 3
+  .endif
+.endif
+
+// CHECK-NOT: .byte 2
+// CHECK-NOT: .byte 3