diff options
| author | Michael Gottesman <mgottesman@apple.com> | 2013-07-08 23:30:23 +0000 |
|---|---|---|
| committer | Michael Gottesman <mgottesman@apple.com> | 2013-07-08 23:30:23 +0000 |
| commit | a75b293e4fa702d3e233839dc347ebf565be2d4d (patch) | |
| tree | 76f83984245441d9fc7446fe96761d1679228b28 /lib/Transforms/ObjCARC/ObjCARC.h | |
| parent | 7b934079c044311c56ebf3809c8c0047d88f825a (diff) | |
| download | llvm-a75b293e4fa702d3e233839dc347ebf565be2d4d.tar.gz llvm-a75b293e4fa702d3e233839dc347ebf565be2d4d.tar.bz2 llvm-a75b293e4fa702d3e233839dc347ebf565be2d4d.tar.xz | |
[objc-arc] Fix assertion in EraseInstruction so that noop on null calls when passed null do not trigger the assert.
The specific case of interest is when objc_retainBlock is passed null.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@185885 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Transforms/ObjCARC/ObjCARC.h')
| -rw-r--r-- | lib/Transforms/ObjCARC/ObjCARC.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/Transforms/ObjCARC/ObjCARC.h b/lib/Transforms/ObjCARC/ObjCARC.h index 39670f339e..1462e85991 100644 --- a/lib/Transforms/ObjCARC/ObjCARC.h +++ b/lib/Transforms/ObjCARC/ObjCARC.h @@ -286,7 +286,9 @@ static inline void EraseInstruction(Instruction *CI) { if (!Unused) { // Replace the return value with the argument. - assert(IsForwarding(GetBasicInstructionClass(CI)) && + assert((IsForwarding(GetBasicInstructionClass(CI)) || + (IsNoopOnNull(GetBasicInstructionClass(CI)) && + isa<ConstantPointerNull>(OldArg))) && "Can't delete non-forwarding instruction with users!"); CI->replaceAllUsesWith(OldArg); } |