From owner-svn-src-projects@FreeBSD.ORG  Sat Jun 12 19:20:39 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E9B0F1065672;
	Sat, 12 Jun 2010 19:20:39 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D9FDC8FC20;
	Sat, 12 Jun 2010 19:20:39 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5CJKde2089888;
	Sat, 12 Jun 2010 19:20:39 GMT
	(envelope-from rdivacky@svn.freebsd.org)
Received: (from rdivacky@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5CJKdo5089886;
	Sat, 12 Jun 2010 19:20:39 GMT
	(envelope-from rdivacky@svn.freebsd.org)
Message-Id: <201006121920.o5CJKdo5089886@svn.freebsd.org>
From: Roman Divacky <rdivacky@FreeBSD.org>
Date: Sat, 12 Jun 2010 19:20:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r209111 -
	projects/clangbsd/contrib/llvm/tools/clang/lib/AST
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 12 Jun 2010 19:20:40 -0000

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;