mirror of
https://github.com/RPCS3/llvm.git
synced 2024-12-26 14:15:53 +00:00
Assert that we don't RAUW a Constant with a ConstantExpr that contains it.
We already had an assert for foo->RAUW(foo), but not for something like foo->RAUW(GEP(foo)) and would go in an infinite loop trying to apply the replacement. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@208663 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
0449d522a6
commit
e2b37447b7
@ -301,10 +301,45 @@ void Value::takeName(Value *V) {
|
||||
ST->reinsertValue(this);
|
||||
}
|
||||
|
||||
#ifndef NDEBUG
|
||||
static bool contains(SmallPtrSet<ConstantExpr *, 4> &Cache, ConstantExpr *Expr,
|
||||
Constant *C) {
|
||||
if (!Cache.insert(Expr))
|
||||
return false;
|
||||
|
||||
for (auto &O : Expr->operands()) {
|
||||
if (O == C)
|
||||
return true;
|
||||
auto *CE = dyn_cast<ConstantExpr>(O);
|
||||
if (!CE)
|
||||
continue;
|
||||
if (contains(Cache, CE, C))
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
static bool contains(Value *Expr, Value *V) {
|
||||
if (Expr == V)
|
||||
return true;
|
||||
|
||||
auto *C = dyn_cast<Constant>(V);
|
||||
if (!C)
|
||||
return false;
|
||||
|
||||
auto *CE = dyn_cast<ConstantExpr>(Expr);
|
||||
if (!CE)
|
||||
return false;
|
||||
|
||||
SmallPtrSet<ConstantExpr *, 4> Cache;
|
||||
return contains(Cache, CE, C);
|
||||
}
|
||||
#endif
|
||||
|
||||
void Value::replaceAllUsesWith(Value *New) {
|
||||
assert(New && "Value::replaceAllUsesWith(<null>) is invalid!");
|
||||
assert(New != this && "this->replaceAllUsesWith(this) is NOT valid!");
|
||||
assert(!contains(New, this) &&
|
||||
"this->replaceAllUsesWith(expr(this)) is NOT valid!");
|
||||
assert(New->getType() == getType() &&
|
||||
"replaceAllUses of value with new value of different type!");
|
||||
|
||||
|
@ -254,6 +254,23 @@ TEST(ConstantsTest, AsInstructionsTest) {
|
||||
P6STR ", i32 1");
|
||||
}
|
||||
|
||||
#ifdef GTEST_HAS_DEATH_TEST
|
||||
#ifndef NDEBUG
|
||||
TEST(ConstantsTest, ReplaceWithConstantTest) {
|
||||
std::unique_ptr<Module> M(new Module("MyModule", getGlobalContext()));
|
||||
|
||||
Type *Int32Ty = Type::getInt32Ty(getGlobalContext());
|
||||
Constant *One = ConstantInt::get(Int32Ty, 1);
|
||||
|
||||
Constant *Global =
|
||||
M->getOrInsertGlobal("dummy", PointerType::getUnqual(Int32Ty));
|
||||
Constant *GEP = ConstantExpr::getGetElementPtr(Global, One);
|
||||
EXPECT_DEATH(Global->replaceAllUsesWith(GEP),
|
||||
"this->replaceAllUsesWith\\(expr\\(this\\)\\) is NOT valid!");
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#undef CHECK
|
||||
|
||||
} // end anonymous namespace
|
||||
|
Loading…
Reference in New Issue
Block a user