summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDuncan Sands <baldrick@free.fr>2011-07-29 07:50:02 +0000
committerDuncan Sands <baldrick@free.fr>2011-07-29 07:50:02 +0000
commitbe64bbf97982b028486e1ec755d2b72e40c12c54 (patch)
tree0bc2e5aec6e187b4030c4aae5c8d824d838c7a18
parent38b9b568b950d2c200e1de2e9cb87d5f8ff6d59f (diff)
downloadbcm5719-llvm-be64bbf97982b028486e1ec755d2b72e40c12c54.tar.gz
bcm5719-llvm-be64bbf97982b028486e1ec755d2b72e40c12c54.zip
Avoid undefined behaviour if somehow NUM_GRAPHS equals 2^32 (or
whatever the size of unsigned is), though this can't actually occur for any integer value of NUM_NODES. llvm-svn: 136460
-rw-r--r--llvm/unittests/ADT/SCCIteratorTest.cpp16
1 files changed, 6 insertions, 10 deletions
diff --git a/llvm/unittests/ADT/SCCIteratorTest.cpp b/llvm/unittests/ADT/SCCIteratorTest.cpp
index c3ffce59abd..00fa0665dda 100644
--- a/llvm/unittests/ADT/SCCIteratorTest.cpp
+++ b/llvm/unittests/ADT/SCCIteratorTest.cpp
@@ -249,14 +249,12 @@ TEST(SCCIteratorTest, AllSmallGraphs) {
// create graphs for which every node has a self-edge.
#define NUM_NODES 4
#define NUM_GRAPHS (NUM_NODES * (NUM_NODES - 1))
+ typedef Graph<NUM_NODES> GT;
- /// GraphDescriptor - Enumerate all graphs using NUM_GRAPHS bits.
- unsigned GraphDescriptor = 0;
- assert(NUM_GRAPHS <= sizeof(unsigned) * CHAR_BIT && "Too many graphs!");
-
- do {
- typedef Graph<NUM_NODES> GT;
-
+ /// Enumerate all graphs using NUM_GRAPHS bits.
+ assert(NUM_GRAPHS < sizeof(unsigned) * CHAR_BIT && "Too many graphs!");
+ for (unsigned GraphDescriptor = 0; GraphDescriptor < (1U << NUM_GRAPHS);
+ ++GraphDescriptor) {
GT G;
// Add edges as specified by the descriptor.
@@ -342,9 +340,7 @@ TEST(SCCIteratorTest, AllSmallGraphs) {
// Finally, check that the nodes in some SCC are exactly those that are
// reachable from the initial node.
EXPECT_EQ(NodesInSomeSCC, G.NodesReachableFrom(0));
-
- ++GraphDescriptor;
- } while (GraphDescriptor && GraphDescriptor < (1U << NUM_GRAPHS));
+ }
}
}
OpenPOWER on IntegriCloud