From 26f301f84bf669f6c408b776992f98d7ee29c064 Mon Sep 17 00:00:00 2001
From: Justin Bogner <mail@justinbogner.com>
Date: Wed, 10 Sep 2014 06:06:07 +0000
Subject: [PATCH] llvm-cov: Fix a misuse of ArrayRef::slice I introduced in
 r217430

It appears this code was completely untested, so using ArrayRef wrong
didn't break anything obvious.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@217476 91177308-0d34-0410-b5e6-96231b3b80d8
---
 .../llvm-cov/Inputs/showExpansions.covmapping | Bin 0 -> 234 bytes
 .../llvm-cov/Inputs/showExpansions.profdata   | Bin 0 -> 672 bytes
 test/tools/llvm-cov/showExpansions.cpp        |  31 ++++++++++++++++++
 tools/llvm-cov/SourceCoverageView.cpp         |   2 +-
 4 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 test/tools/llvm-cov/Inputs/showExpansions.covmapping
 create mode 100644 test/tools/llvm-cov/Inputs/showExpansions.profdata
 create mode 100644 test/tools/llvm-cov/showExpansions.cpp

diff --git a/test/tools/llvm-cov/Inputs/showExpansions.covmapping b/test/tools/llvm-cov/Inputs/showExpansions.covmapping
new file mode 100644
index 0000000000000000000000000000000000000000..dd73090ccd9639b379dbf19ba1bf6e0ab6929c43
GIT binary patch
literal 234
zcmW-a&1%9x6ot=C<|<P%QZW|$15;=z-RN}LmAL7?n?68{p$bVRIKg)5t99$jN9r9f
zd>6j6IH#@;P3aF!Uxj{C^o2VA9go*dv1<vyO4thV&W}LMl&}^~Z?9=|TDq@L?SotU
z@3z{z(r+qPORbBYuJ^tU7oW?H3tRv5@!J(`*!ear%C3uj(8R1+Tf_R^*ePo>X39TR
zlF|$A81JwdU14nTjEQ1109#~i9+DAexx73b4JEummYQ3d(I7EO{0SMEH~{<uk<TiW

literal 0
HcmV?d00001

diff --git a/test/tools/llvm-cov/Inputs/showExpansions.profdata b/test/tools/llvm-cov/Inputs/showExpansions.profdata
new file mode 100644
index 0000000000000000000000000000000000000000..7925c6020686c10bd7cf822db8175036c03d6401
GIT binary patch
literal 672
zcmeyLQ&5zjmf6U}00E3p8b(cki~qXX``j#L>TMRNhzFF;P0Y+YWuU<f(#Z~24Pm4}
c`7kOO#=uECKxNR~fm6e%#E=RB4H8`o0ILoTJpcdz

literal 0
HcmV?d00001

diff --git a/test/tools/llvm-cov/showExpansions.cpp b/test/tools/llvm-cov/showExpansions.cpp
new file mode 100644
index 00000000000..db5786b9892
--- /dev/null
+++ b/test/tools/llvm-cov/showExpansions.cpp
@@ -0,0 +1,31 @@
+// RUN: llvm-cov show %S/Inputs/showExpansions.covmapping -instr-profile %S/Inputs/showExpansions.profdata -dump -show-expansions -filename-equivalence %s | FileCheck %s
+
+#define DO_SOMETHING_ELSE() \
+  do {                      \
+  } while (0)
+#define ANOTHER_THING() \
+  do {                  \
+    if (0) {            \
+    }                   \
+  } while (0)
+
+#define DO_SOMETHING(x)    \
+  do {                     \
+    if (x)                 \
+      DO_SOMETHING_ELSE(); \
+    else                   \
+      ANOTHER_THING();     \
+  } while (0)
+
+int main(int argc, const char *argv[]) {
+  for (int i = 0; i < 100; ++i)
+    DO_SOMETHING(i);
+  return 0;
+}
+
+// CHECK: Expansion of {{[0-9]+}}:13 -> 18 @ {{[0-9]+}}, 22:5
+// CHECK: Expansion of {{[0-9]+}}:4 -> 5 @ {{[0-9]+}}, 15:7
+// CHECK: Expansion of {{[0-9]+}}:7 -> 10 @ {{[0-9]+}}, 17:7
+
+// llvm-cov doesn't work on big endian yet
+// XFAIL: powerpc64-, s390x, mips-, mips64-, sparc
diff --git a/tools/llvm-cov/SourceCoverageView.cpp b/tools/llvm-cov/SourceCoverageView.cpp
index 5f873acba0d..159d74adf38 100644
--- a/tools/llvm-cov/SourceCoverageView.cpp
+++ b/tools/llvm-cov/SourceCoverageView.cpp
@@ -206,7 +206,7 @@ gatherLineSubViews(size_t &CurrentIdx,
   while (CurrentIdx < E &&
          Items[CurrentIdx]->getSubViewsExpansionLine() == LineNo)
     ++CurrentIdx;
-  return Items.slice(PrevIdx, CurrentIdx);
+  return Items.slice(PrevIdx, CurrentIdx - PrevIdx);
 }
 
 void SourceCoverageView::render(raw_ostream &OS, unsigned Offset) {