diff --git a/lib/AST/ExprConstant.cpp b/lib/AST/ExprConstant.cpp
index ef8e2d4..6b71d11 100644
--- a/lib/AST/ExprConstant.cpp
+++ b/lib/AST/ExprConstant.cpp
@@ -972,6 +972,9 @@
 }
 
 bool FloatExprEvaluator::VisitUnaryOperator(const UnaryOperator *E) {
+  if (E->getOpcode() == UnaryOperator::Deref)
+    return false;
+
   if (!EvaluateFloat(E->getSubExpr(), Result, Info))
     return false;
 
diff --git a/test/CodeGen/exprs.c b/test/CodeGen/exprs.c
index 275c988..07a9158 100644
--- a/test/CodeGen/exprs.c
+++ b/test/CodeGen/exprs.c
@@ -45,3 +45,10 @@
   if ((0, (int)a) & 2) { return 1; }
   return 2;
 }
+
+// this one shouldn't fold as well
+void eMaisUma() {
+	double t[1];
+	if (*t)
+		return;
+}