From 193809ec3ad035f45724f31328142f38a4e9f66a Mon Sep 17 00:00:00 2001
From: AB1908 <abhishekbhattachejree@live.com>
Date: Wed, 16 Jan 2019 05:32:03 +0000
Subject: [PATCH 1/3] Add regression test to close #53787

---
 .../ui/issue-53787-inline-assembler-macro.rs  | 24 +++++++++++++++++++
 .../issue-53787-inline-assembler-macro.stderr |  9 +++++++
 2 files changed, 33 insertions(+)
 create mode 100644 src/test/ui/issue-53787-inline-assembler-macro.rs
 create mode 100644 src/test/ui/issue-53787-inline-assembler-macro.stderr

diff --git a/src/test/ui/issue-53787-inline-assembler-macro.rs b/src/test/ui/issue-53787-inline-assembler-macro.rs
new file mode 100644
index 0000000000000..4f1048f787dab
--- /dev/null
+++ b/src/test/ui/issue-53787-inline-assembler-macro.rs
@@ -0,0 +1,24 @@
+// Regression test for Issue #53787: Fix ICE when creating a label in inline assembler with macros.
+
+#![feature(asm)]
+
+macro_rules! fake_jump {
+    ($id:expr) => {
+        unsafe {
+            
+            asm!(
+            "
+            jmp $0
+            lea eax, [ebx]
+            xor eax, 0xDEADBEEF
+            retn
+            $0:
+            "::"0"($id)::"volatile", "intel");
+        }
+    };
+}
+
+fn main() {
+    fake_jump!("FirstFunc"); //~ ERROR invalid value for constraint in inline assembly
+    println!("Hello, world!");
+}
diff --git a/src/test/ui/issue-53787-inline-assembler-macro.stderr b/src/test/ui/issue-53787-inline-assembler-macro.stderr
new file mode 100644
index 0000000000000..f63b2e1932754
--- /dev/null
+++ b/src/test/ui/issue-53787-inline-assembler-macro.stderr
@@ -0,0 +1,9 @@
+error[E0669]: invalid value for constraint in inline assembly
+  --> $DIR/issue-53787-inline-assembler-macro.rs:22:16
+   |
+LL |     fake_jump!("FirstFunc"); //~ ERROR invalid value for constraint in inline assembly
+   |                ^^^^^^^^^^^
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0669`.

From 3f0a75d80619e99e849c10fde406da4109db9e29 Mon Sep 17 00:00:00 2001
From: AB1908 <abhishekbhattachejree@live.com>
Date: Wed, 16 Jan 2019 06:29:44 +0000
Subject: [PATCH 2/3] Remove trailing whitespace

---
 src/test/ui/issue-53787-inline-assembler-macro.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/test/ui/issue-53787-inline-assembler-macro.rs b/src/test/ui/issue-53787-inline-assembler-macro.rs
index 4f1048f787dab..937bce1b655dd 100644
--- a/src/test/ui/issue-53787-inline-assembler-macro.rs
+++ b/src/test/ui/issue-53787-inline-assembler-macro.rs
@@ -5,7 +5,6 @@
 macro_rules! fake_jump {
     ($id:expr) => {
         unsafe {
-            
             asm!(
             "
             jmp $0

From 0edc5c9779cbe5a3d244f3915ebb05813973e592 Mon Sep 17 00:00:00 2001
From: AB1908 <abhishekbhattachejree@live.com>
Date: Wed, 16 Jan 2019 23:08:42 +0000
Subject: [PATCH 3/3] Fix error template

---
 src/test/ui/issue-53787-inline-assembler-macro.stderr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/ui/issue-53787-inline-assembler-macro.stderr b/src/test/ui/issue-53787-inline-assembler-macro.stderr
index f63b2e1932754..69f380bdc9c03 100644
--- a/src/test/ui/issue-53787-inline-assembler-macro.stderr
+++ b/src/test/ui/issue-53787-inline-assembler-macro.stderr
@@ -1,5 +1,5 @@
 error[E0669]: invalid value for constraint in inline assembly
-  --> $DIR/issue-53787-inline-assembler-macro.rs:22:16
+  --> $DIR/issue-53787-inline-assembler-macro.rs:21:16
    |
 LL |     fake_jump!("FirstFunc"); //~ ERROR invalid value for constraint in inline assembly
    |                ^^^^^^^^^^^