diff --git a/AST/Expr.cpp b/AST/Expr.cpp
index 545ebd8..c6a6ab3 100644
--- a/AST/Expr.cpp
+++ b/AST/Expr.cpp
@@ -443,8 +443,13 @@
     const UnaryOperator *Exp = cast<UnaryOperator>(this);
     
     // C99 6.6p9
-    if (Exp->getOpcode() == UnaryOperator::AddrOf)
-      return Exp->getSubExpr()->hasStaticStorage();
+    if (Exp->getOpcode() == UnaryOperator::AddrOf) {
+      if (!Exp->getSubExpr()->hasStaticStorage()) {
+        if (Loc) *Loc = getLocStart();
+        return false;
+      }
+      return true;
+    }
 
     // Get the operand value.  If this is sizeof/alignof, do not evalute the
     // operand.  This affects C99 6.6p3.