From c723eb1aef817d47feec620933ee1ec6005cdd14 Mon Sep 17 00:00:00 2001 From: Eric Christopher Date: Mon, 2 Jul 2012 23:22:21 +0000 Subject: Revert "IntRange:" as it appears to be breaking self hosting. This reverts commit b2833d9dcba88c6f0520cad760619200adc0442c. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@159618 91177308-0d34-0410-b5e6-96231b3b80d8 --- unittests/Support/IntegersSubsetTest.cpp | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) (limited to 'unittests') diff --git a/unittests/Support/IntegersSubsetTest.cpp b/unittests/Support/IntegersSubsetTest.cpp index a103161..5d1dde4 100644 --- a/unittests/Support/IntegersSubsetTest.cpp +++ b/unittests/Support/IntegersSubsetTest.cpp @@ -193,20 +193,20 @@ namespace { const unsigned_ranges IntersectRes, unsigned IntersectResSize ) { - unsigned successors[2] = {0, 1}; + Mapping::RangesCollection Ranges; Mapping LHSMapping; for (unsigned i = 0; i < LSize; ++i) Ranges.push_back(Range(Int(LHS[i][0]), Int(LHS[i][1]))); - LHSMapping.add(Ranges, &successors[0]); + LHSMapping.add(Ranges); Ranges.clear(); Mapping RHSMapping; for (unsigned i = 0; i < RSize; ++i) Ranges.push_back(Range(Int(RHS[i][0]), Int(RHS[i][1]))); - RHSMapping.add(Ranges, &successors[1]); + RHSMapping.add(Ranges); Mapping LExclude, Intersection; @@ -217,10 +217,8 @@ namespace { unsigned i = 0; for (Mapping::RangeIterator rei = LExclude.begin(), - e = LExclude.end(); rei != e; ++rei, ++i) { + e = LExclude.end(); rei != e; ++rei, ++i) EXPECT_EQ(rei->first, Range(ExcludeRes[i][0], ExcludeRes[i][1])); - EXPECT_EQ(rei->second, &successors[0]); - } } else EXPECT_TRUE(LExclude.empty()); @@ -229,10 +227,8 @@ namespace { unsigned i = 0; for (Mapping::RangeIterator ii = Intersection.begin(), - e = Intersection.end(); ii != e; ++ii, ++i) { + e = Intersection.end(); ii != e; ++ii, ++i) EXPECT_EQ(ii->first, Range(IntersectRes[i][0], IntersectRes[i][1])); - EXPECT_EQ(ii->second, &successors[0]); - } } else EXPECT_TRUE(Intersection.empty()); @@ -245,11 +241,9 @@ namespace { EXPECT_EQ(LExclude.size(), ExcludeResSize); unsigned i = 0; - for (Mapping::RangeIterator lei = LExclude.begin(), - e = LExclude.end(); lei != e; ++lei, ++i) { - EXPECT_EQ(lei->first, Range(ExcludeRes[i][0], ExcludeRes[i][1])); - EXPECT_EQ(lei->second, &successors[0]); - } + for (Mapping::RangeIterator rei = LExclude.begin(), + e = LExclude.end(); rei != e; ++rei, ++i) + EXPECT_EQ(rei->first, Range(ExcludeRes[i][0], ExcludeRes[i][1])); } else EXPECT_TRUE(LExclude.empty()); } -- cgit v1.1