svn commit: r209111 - projects/clangbsd/contrib/llvm/tools/clang/lib/AST

[Roman Divacky]

Author: rdivacky
Date: Sat Jun 12 19:20:39 2010
New Revision: 209111
URL: http://svn.freebsd.org/changeset/base/209111

Log:
  This has been fixed, revert the workaround.

Modified:
  projects/clangbsd/contrib/llvm/tools/clang/lib/AST/ExprConstant.cpp

Modified: projects/clangbsd/contrib/llvm/tools/clang/lib/AST/ExprConstant.cpp
==============================================================================
--- projects/clangbsd/contrib/llvm/tools/clang/lib/AST/ExprConstant.cpp	Sat Jun 12 17:32:05 2010	(r209110)
+++ projects/clangbsd/contrib/llvm/tools/clang/lib/AST/ExprConstant.cpp	Sat Jun 12 19:20:39 2010	(r209111)
@@ -1274,7 +1274,7 @@ bool IntExprEvaluator::VisitBinaryOperat
       // Reject any bases from the normal codepath; we special-case comparisons
       // to null.
       if (LHSValue.getLValueBase()) {
-//        if (!E->isEqualityOp())
+        if (!E->isEqualityOp())
           return false;
         if (RHSValue.getLValueBase() || !RHSValue.getLValueOffset().isZero())
           return false;
@@ -1283,7 +1283,7 @@ bool IntExprEvaluator::VisitBinaryOperat
           return false;
         return Success(bres ^ (E->getOpcode() == BinaryOperator::EQ), E);
       } else if (RHSValue.getLValueBase()) {
-//        if (!E->isEqualityOp())
+        if (!E->isEqualityOp())
           return false;
         if (LHSValue.getLValueBase() || !LHSValue.getLValueOffset().isZero())
           return false;