From 719dc0e356ca506b9aefd4248f0f9b2def805e76 Mon Sep 17 00:00:00 2001
From: David Blaikie <dblaikie@gmail.com>
Date: Wed, 1 Feb 2017 17:15:24 +0000
Subject: [PATCH] Add missing test cases from r293697/D29094

Differential Revision: https://reviews.llvm.org/D29368

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@293785 91177308-0d34-0410-b5e6-96231b3b80d8
---
 test/tools/llvm-symbolizer/Inputs/discrim     | Bin 0 -> 9973 bytes
 test/tools/llvm-symbolizer/Inputs/discrim.c   |   8 ++++
 test/tools/llvm-symbolizer/Inputs/discrim.inp |   5 +++
 test/tools/llvm-symbolizer/sym-verbose.test   |  36 ++++++++++++++++++
 4 files changed, 49 insertions(+)
 create mode 100644 test/tools/llvm-symbolizer/Inputs/discrim
 create mode 100644 test/tools/llvm-symbolizer/Inputs/discrim.c
 create mode 100644 test/tools/llvm-symbolizer/Inputs/discrim.inp
 create mode 100644 test/tools/llvm-symbolizer/sym-verbose.test

diff --git a/test/tools/llvm-symbolizer/Inputs/discrim b/test/tools/llvm-symbolizer/Inputs/discrim
new file mode 100644
index 0000000000000000000000000000000000000000..ec61fe960bffb5efd7cc3cf7d0d96e58ed231c49
GIT binary patch
literal 9973
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
JR>__c{|0Ins%QWJ

literal 0
HcmV?d00001

diff --git a/test/tools/llvm-symbolizer/Inputs/discrim.c b/test/tools/llvm-symbolizer/Inputs/discrim.c
new file mode 100644
index 00000000000..decbce8d454
--- /dev/null
+++ b/test/tools/llvm-symbolizer/Inputs/discrim.c
@@ -0,0 +1,8 @@
+static volatile int do_mul;
+static volatile int do_inc;
+
+int main () {
+  int x = 1;
+  if (do_mul) x *= 2; else x /= 2;
+  return do_inc ? ++x : --x;
+}
diff --git a/test/tools/llvm-symbolizer/Inputs/discrim.inp b/test/tools/llvm-symbolizer/Inputs/discrim.inp
new file mode 100644
index 00000000000..f8ad6018d70
--- /dev/null
+++ b/test/tools/llvm-symbolizer/Inputs/discrim.inp
@@ -0,0 +1,5 @@
+some text
+0x4004f2
+0x400509
+0x40050d
+some more text
diff --git a/test/tools/llvm-symbolizer/sym-verbose.test b/test/tools/llvm-symbolizer/sym-verbose.test
new file mode 100644
index 00000000000..b8c3a418b93
--- /dev/null
+++ b/test/tools/llvm-symbolizer/sym-verbose.test
@@ -0,0 +1,36 @@
+#static volatile int do_mul;
+#static volatile int do_inc;
+#
+#int main () {
+#  int x = 1;
+#  if (do_mul) x *= 2; else x /= 2;
+#  return do_inc ? ++x : --x;
+#}
+#Build as : clang -g -O2 discrim.c -o discrim
+
+RUN: llvm-symbolizer -verbose -print-address -obj=%p/Inputs/discrim < %p/Inputs/discrim.inp | FileCheck %s
+
+#CHECK: some text
+
+#CHECK: 0x4004f2
+#CHECK-NEXT: main
+#CHECK-NEXT: Filename: /tmp/discrim.c
+#CHECK-NEXT: Line: 6
+#CHECK-NEXT: Column: 7
+#CHECK-NOT: Discriminator: 0
+
+#CHECK: 0x400509
+#CHECK-NEXT: main
+#CHECK-NEXT: Filename: /tmp/discrim.c
+#CHECK-NEXT: Line: 7
+#CHECK-NEXT: Column: 3
+#CHECK-NEXT: Discriminator: 1
+
+#CHECK: 0x40050d
+#CHECK-NEXT: main
+#CHECK-NEXT: Filename: /tmp/discrim.c
+#CHECK-NEXT: Line: 7
+#CHECK-NEXT: Column: 3
+#CHECK-NEXT: Discriminator: 2
+
+#CHECK: some more text