diff options
| author | John McCall <rjmccall@apple.com> | 2012-08-21 02:47:43 +0000 |
|---|---|---|
| committer | John McCall <rjmccall@apple.com> | 2012-08-21 02:47:43 +0000 |
| commit | 0a7dd788dbef975f35f273c7ab913f480f7edd60 (patch) | |
| tree | 4ff726c6ed21d7c822a307b124bf4fec48ffc89a /lib/ARCMigrate | |
| parent | eb8f2efb17c74620510a38cb437e792ea9c76021 (diff) | |
Screw around with ObjCRuntime some more, changing the
diagnostics for bad deployment targets and adding a few
more predicates. Includes a patch by Jonathan Schleifer
to enable ARC for ObjFW.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@162252 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/ARCMigrate')
| -rw-r--r-- | lib/ARCMigrate/ARCMT.cpp | 2 | ||||
| -rw-r--r-- | lib/ARCMigrate/Transforms.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/ARCMigrate/ARCMT.cpp b/lib/ARCMigrate/ARCMT.cpp index f291dec21f..14e13ba58c 100644 --- a/lib/ARCMigrate/ARCMT.cpp +++ b/lib/ARCMigrate/ARCMT.cpp @@ -237,7 +237,7 @@ createInvocationForMigration(CompilerInvocation &origCI) { WarnOpts.push_back("error=arc-unsafe-retained-assign"); CInvok->getDiagnosticOpts().Warnings = llvm_move(WarnOpts); - CInvok->getLangOpts()->ObjCRuntimeHasWeak = HasARCRuntime(origCI); + CInvok->getLangOpts()->ObjCARCWeak = HasARCRuntime(origCI); return CInvok.take(); } diff --git a/lib/ARCMigrate/Transforms.cpp b/lib/ARCMigrate/Transforms.cpp index 1175c36316..f01dfa9c15 100644 --- a/lib/ARCMigrate/Transforms.cpp +++ b/lib/ARCMigrate/Transforms.cpp @@ -40,7 +40,7 @@ bool MigrationPass::CFBridgingFunctionsDefined() { bool trans::canApplyWeak(ASTContext &Ctx, QualType type, bool AllowOnUnknownClass) { - if (!Ctx.getLangOpts().ObjCRuntimeHasWeak) + if (!Ctx.getLangOpts().ObjCARCWeak) return false; QualType T = type; |