From 71c1b228552ece06003d744b815f669dbfbb0772 Mon Sep 17 00:00:00 2001 From: Benjamin Kramer Date: Fri, 12 Apr 2013 08:33:11 +0000 Subject: Fix a disconcerting bug in Value::isUsedInBasicBlock, which gave wrong answers for blocks larger than 3 instrs. Also add a unit test. PR15727. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@179370 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/IR/Value.cpp | 2 +- unittests/IR/CMakeLists.txt | 1 + unittests/IR/ValueTest.cpp | 46 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 unittests/IR/ValueTest.cpp diff --git a/lib/IR/Value.cpp b/lib/IR/Value.cpp index adc702e05e..e9eb012e6c 100644 --- a/lib/IR/Value.cpp +++ b/lib/IR/Value.cpp @@ -118,7 +118,7 @@ bool Value::isUsedInBasicBlock(const BasicBlock *BB) const { for (BasicBlock::const_iterator I = BB->begin(), E = BB->end(); I != E; ++I) { if (std::find(I->op_begin(), I->op_end(), this) != I->op_end()) return true; - if (MaxBlockSize-- == 0) // If the block is larger fall back to use_iterator + if (--MaxBlockSize == 0) // If the block is larger fall back to use_iterator break; } diff --git a/unittests/IR/CMakeLists.txt b/unittests/IR/CMakeLists.txt index aed45979c0..b6098c7928 100644 --- a/unittests/IR/CMakeLists.txt +++ b/unittests/IR/CMakeLists.txt @@ -16,6 +16,7 @@ set(IRSources TypeBuilderTest.cpp TypesTest.cpp ValueMapTest.cpp + ValueTest.cpp VerifierTest.cpp WaymarkTest.cpp ) diff --git a/unittests/IR/ValueTest.cpp b/unittests/IR/ValueTest.cpp new file mode 100644 index 0000000000..52efb1a220 --- /dev/null +++ b/unittests/IR/ValueTest.cpp @@ -0,0 +1,46 @@ +//===- llvm/unittest/IR/ValueTest.cpp - Value unit tests ------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +#include "llvm/Assembly/Parser.h" +#include "llvm/IR/Function.h" +#include "llvm/IR/LLVMContext.h" +#include "llvm/IR/Module.h" +#include "llvm/IR/Value.h" +#include "llvm/Support/SourceMgr.h" +#include "gtest/gtest.h" +using namespace llvm; + +namespace { + +TEST(ValueTest, UsedInBasicBlock) { + LLVMContext C; + + const char *ModuleString = "define void @f(i32 %x, i32 %y) {\n" + "bb0:\n" + " %y1 = add i32 %y, 1\n" + " %y2 = add i32 %y, 1\n" + " %y3 = add i32 %y, 1\n" + " %y4 = add i32 %y, 1\n" + " %y5 = add i32 %y, 1\n" + " %y6 = add i32 %y, 1\n" + " %y7 = add i32 %y, 1\n" + " %y8 = add i32 %x, 1\n" + " ret void\n" + "}\n"; + SMDiagnostic Err; + Module *M = ParseAssemblyString(ModuleString, NULL, Err, C); + + Function *F = M->getFunction("f"); + + EXPECT_FALSE(F->isUsedInBasicBlock(F->begin())); + EXPECT_TRUE((++F->arg_begin())->isUsedInBasicBlock(F->begin())); + EXPECT_TRUE(F->arg_begin()->isUsedInBasicBlock(F->begin())); +} + +} // end anonymous namespace -- cgit v1.2.3