1 files changed, 5 insertions, 6 deletions
diff --git a/Driver/RewriteObjC.cpp b/Driver/RewriteObjC.cpp
index f66658864b..c78e519630 100644
--- a/Driver/RewriteObjC.cpp
+++ b/Driver/RewriteObjC.cpp
@@ -846,13 +846,12 @@ Stmt *RewriteObjC::RewriteObjCIvarRefExpr(ObjCIvarRefExpr *IV) {
         }
       }
     }
+  } else { // we are outside a method.
+    if (IV->isFreeIvar())
+      assert(1 && "Cannot have a free standing ivar outside a method");
+    // Explicit ivar refs do not need to be rewritten. Do nothing.
   }
-  // FIXME: Implement public ivar access from a function.
-  Expr *Replacement = new MemberExpr(IV->getBase(), true, D, 
-                                     IV->getLocation(), D->getType());
-  ReplaceStmt(IV, Replacement);
-  delete IV;
-  return Replacement;
+  return IV;
 }
 
 //===----------------------------------------------------------------------===//