mirror of
https://github.com/llvm/llvm-project.git
synced 2025-04-27 05:46:06 +00:00
9390747349
- Replace calling -zone with 'nil'. -zone is obsolete in ARC.
- Allow removing retain/release on a static global var.
- Fix assertion hit when scanning for name references outside a NSAutoreleasePool scope.
- Automatically add bridged casts for results of objc method calls and when calling CFRetain, for example:
NSString *s;
CFStringRef ref = [s string]; -> CFStringRef ref = (__bridge CFStringRef)([s string]);
ref = s.string; -> ref = (__bridge CFStringRef)(s.string);
ref = [NSString new]; -> ref = (__bridge_retained CFStringRef)([NSString new]);
ref = [s newString]; -> ref = (__bridge_retained CFStringRef)([s newString]);
ref = [[NSString alloc] init]; -> ref = (__bridge_retained CFStringRef)([[NSString alloc] init]);
ref = [[s string] retain]; -> ref = (__bridge_retained CFStringRef)([s string]);
ref = CFRetain(s); -> ref = (__bridge_retained CFTypeRef)(s);
ref = [s retain]; -> ref = (__bridge_retained CFStringRef)(s);
- Emit migrator error when trying to cast to CF type the result of autorelease/release:
for
CFStringRef f3() {
return (CFStringRef)[[[NSString alloc] init] autorelease];
}
emits:
t.m:12:10: error: [rewriter] it is not safe to cast to 'CFStringRef' the result of 'autorelease' message; a __bridge cast may result in a pointer to a destroyed object and a __bridge_retained may leak the object
return (CFStringRef)[[[NSString alloc] init] autorelease];
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
t.m:12:3: note: [rewriter] remove the cast and change return type of function to 'NSString *' to have the object automatically autoreleased
return (CFStringRef)[[[NSString alloc] init] autorelease];
^
- Before changing attributes to weak/unsafe_unretained, check if the backing ivar
is set to a +1 object, in which case use 'strong' instead.
llvm-svn: 136208
127 lines
3.1 KiB
C++
127 lines
3.1 KiB
C++
//===--- ParentMap.cpp - Mappings from Stmts to their Parents ---*- C++ -*-===//
|
|
//
|
|
// The LLVM Compiler Infrastructure
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
//
|
|
// This file defines the ParentMap class.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "clang/AST/ParentMap.h"
|
|
#include "clang/AST/Decl.h"
|
|
#include "clang/AST/Expr.h"
|
|
#include "llvm/ADT/DenseMap.h"
|
|
|
|
using namespace clang;
|
|
|
|
typedef llvm::DenseMap<Stmt*, Stmt*> MapTy;
|
|
|
|
static void BuildParentMap(MapTy& M, Stmt* S) {
|
|
for (Stmt::child_range I = S->children(); I; ++I)
|
|
if (*I) {
|
|
M[*I] = S;
|
|
BuildParentMap(M, *I);
|
|
}
|
|
}
|
|
|
|
ParentMap::ParentMap(Stmt* S) : Impl(0) {
|
|
if (S) {
|
|
MapTy *M = new MapTy();
|
|
BuildParentMap(*M, S);
|
|
Impl = M;
|
|
}
|
|
}
|
|
|
|
ParentMap::~ParentMap() {
|
|
delete (MapTy*) Impl;
|
|
}
|
|
|
|
void ParentMap::addStmt(Stmt* S) {
|
|
if (S) {
|
|
BuildParentMap(*(MapTy*) Impl, S);
|
|
}
|
|
}
|
|
|
|
Stmt* ParentMap::getParent(Stmt* S) const {
|
|
MapTy* M = (MapTy*) Impl;
|
|
MapTy::iterator I = M->find(S);
|
|
return I == M->end() ? 0 : I->second;
|
|
}
|
|
|
|
Stmt *ParentMap::getParentIgnoreParens(Stmt *S) const {
|
|
do { S = getParent(S); } while (S && isa<ParenExpr>(S));
|
|
return S;
|
|
}
|
|
|
|
Stmt *ParentMap::getParentIgnoreParenCasts(Stmt *S) const {
|
|
do {
|
|
S = getParent(S);
|
|
}
|
|
while (S && (isa<ParenExpr>(S) || isa<CastExpr>(S)));
|
|
|
|
return S;
|
|
}
|
|
|
|
Stmt *ParentMap::getParentIgnoreParenImpCasts(Stmt *S) const {
|
|
do {
|
|
S = getParent(S);
|
|
} while (S && isa<Expr>(S) && cast<Expr>(S)->IgnoreParenImpCasts() != S);
|
|
|
|
return S;
|
|
}
|
|
|
|
Stmt *ParentMap::getOuterParenParent(Stmt *S) const {
|
|
Stmt *Paren = 0;
|
|
while (isa<ParenExpr>(S)) {
|
|
Paren = S;
|
|
S = getParent(S);
|
|
};
|
|
return Paren;
|
|
}
|
|
|
|
bool ParentMap::isConsumedExpr(Expr* E) const {
|
|
Stmt *P = getParent(E);
|
|
Stmt *DirectChild = E;
|
|
|
|
// Ignore parents that are parentheses or casts.
|
|
while (P && (isa<ParenExpr>(P) || isa<CastExpr>(P))) {
|
|
DirectChild = P;
|
|
P = getParent(P);
|
|
}
|
|
|
|
if (!P)
|
|
return false;
|
|
|
|
switch (P->getStmtClass()) {
|
|
default:
|
|
return isa<Expr>(P);
|
|
case Stmt::DeclStmtClass:
|
|
return true;
|
|
case Stmt::BinaryOperatorClass: {
|
|
BinaryOperator *BE = cast<BinaryOperator>(P);
|
|
// If it is a comma, only the right side is consumed.
|
|
// If it isn't a comma, both sides are consumed.
|
|
return BE->getOpcode()!=BO_Comma ||DirectChild==BE->getRHS();
|
|
}
|
|
case Stmt::ForStmtClass:
|
|
return DirectChild == cast<ForStmt>(P)->getCond();
|
|
case Stmt::WhileStmtClass:
|
|
return DirectChild == cast<WhileStmt>(P)->getCond();
|
|
case Stmt::DoStmtClass:
|
|
return DirectChild == cast<DoStmt>(P)->getCond();
|
|
case Stmt::IfStmtClass:
|
|
return DirectChild == cast<IfStmt>(P)->getCond();
|
|
case Stmt::IndirectGotoStmtClass:
|
|
return DirectChild == cast<IndirectGotoStmt>(P)->getTarget();
|
|
case Stmt::SwitchStmtClass:
|
|
return DirectChild == cast<SwitchStmt>(P)->getCond();
|
|
case Stmt::ReturnStmtClass:
|
|
return true;
|
|
}
|
|
}
|
|
|