diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Basic/Targets.cpp | 1 | ||||
| -rw-r--r-- | lib/Parse/ParseExpr.cpp | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp index 7a062fcd62..5fcd0d2af9 100644 --- a/lib/Basic/Targets.cpp +++ b/lib/Basic/Targets.cpp @@ -104,6 +104,7 @@ static void getDarwinDefines(MacroBuilder &Builder, const LangOptions &Opts, Builder.defineMacro("__bridge", ""); Builder.defineMacro("__bridge_transfer", ""); Builder.defineMacro("__bridge_retained", ""); + Builder.defineMacro("__bridge_retain", ""); } if (Opts.Static) diff --git a/lib/Parse/ParseExpr.cpp b/lib/Parse/ParseExpr.cpp index 01bd0ed336..14f3805cd9 100644 --- a/lib/Parse/ParseExpr.cpp +++ b/lib/Parse/ParseExpr.cpp @@ -1780,7 +1780,8 @@ Parser::ParseParenExpression(ParenParseOption &ExprType, bool stopIfCastExpr, } else if (ExprType >= CompoundLiteral && (Tok.is(tok::kw___bridge) || Tok.is(tok::kw___bridge_transfer) || - Tok.is(tok::kw___bridge_retained))) { + Tok.is(tok::kw___bridge_retained) || + Tok.is(tok::kw___bridge_retain))) { // FIXME: temporary workaround // Parse an Objective-C ARC ownership cast expression. ObjCBridgeCastKind Kind; if (Tok.is(tok::kw___bridge)) |