From d38e5858f01f67e3ad096135312de8a9e7814a74 Mon Sep 17 00:00:00 2001
From: Jesse Rosenstock <jmr@google.com>
Date: Mon, 24 Aug 2020 10:01:58 +0200
Subject: [PATCH] Add tests for #1211

CL_MoveRefs: Add CHECK (E->JumpTo != NULL) to make failure clearer.
---
 src/cc65/codelab.c                 |  1 +
 test/err/bug1211-ice-move-refs-1.c | 52 ++++++++++++++++++++++++++++++
 test/err/bug1211-ice-move-refs-2.c | 51 +++++++++++++++++++++++++++++
 3 files changed, 104 insertions(+)
 create mode 100644 test/err/bug1211-ice-move-refs-1.c
 create mode 100644 test/err/bug1211-ice-move-refs-2.c

diff --git a/src/cc65/codelab.c b/src/cc65/codelab.c
index f36520835..ff26645dc 100644
--- a/src/cc65/codelab.c
+++ b/src/cc65/codelab.c
@@ -112,6 +112,7 @@ void CL_MoveRefs (CodeLabel* OldLabel, CodeLabel* NewLabel)
         CodeEntry* E = CL_GetRef (OldLabel, Count);
 
         /* Change the reference to the new label */
+        CHECK (E->JumpTo != NULL);
         CHECK (E->JumpTo == OldLabel);
         CL_AddRef (NewLabel, E);
 
diff --git a/test/err/bug1211-ice-move-refs-1.c b/test/err/bug1211-ice-move-refs-1.c
new file mode 100644
index 000000000..f28d1fcbc
--- /dev/null
+++ b/test/err/bug1211-ice-move-refs-1.c
@@ -0,0 +1,52 @@
+/*
+  Copyright 2020 The cc65 Authors
+
+  This software is provided 'as-is', without any express or implied
+  warranty. In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/*
+  Test of indirect goto with label merge ICE.
+  https://github.com/cc65/cc65/issues/1211
+  This should compile and should be moved to tests/val/ when the bug is fixed.
+*/
+
+#include <stdio.h>
+
+/* When operating correctly, f(0) = 31 and f(1) = 41. */
+int f (int x)
+{
+    static const void *const labels[] = {&&L0, &&L1};
+    goto *labels[x];
+L0: if (labels[0] != labels[1]) return 31;
+    else return 13;
+L1: return 41;
+}
+
+static unsigned char failures = 0;
+
+int main (void)
+{
+    if (f (0) != 31) failures++;
+
+    if (failures == 0) {
+        printf ("PASS\n");
+    } else {
+        printf ("FAIL\n");
+    }
+
+    return failures;
+}
diff --git a/test/err/bug1211-ice-move-refs-2.c b/test/err/bug1211-ice-move-refs-2.c
new file mode 100644
index 000000000..504433f45
--- /dev/null
+++ b/test/err/bug1211-ice-move-refs-2.c
@@ -0,0 +1,51 @@
+/*
+  Copyright 2020 The cc65 Authors
+
+  This software is provided 'as-is', without any express or implied
+  warranty. In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/*
+  Test of indirect goto with label merge ICE.
+  https://github.com/cc65/cc65/issues/1211
+  This should compile and should be moved to tests/val/ when the bug is fixed.
+*/
+
+#include <stdio.h>
+
+/* When operating correctly, this returns 0. */
+int f (void)
+{
+    static const void *const x[2] = {&&L0, &&L1};
+    goto *x[0];
+L0:
+L1: return 0;
+}
+
+static unsigned char failures = 0;
+
+int main (void)
+{
+    if (f () != 0) failures++;
+
+    if (failures == 0) {
+        printf ("PASS\n");
+    } else {
+        printf ("FAIL\n");
+    }
+
+    return failures;
+}