From owner-svn-src-stable-9@FreeBSD.ORG  Fri Aug 23 18:02:38 2013
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 1AB738A2;
 Fri, 23 Aug 2013 18:02:38 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0725427E4;
 Fri, 23 Aug 2013 18:02:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7NI2bHt096034;
 Fri, 23 Aug 2013 18:02:37 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7NI2btZ096033;
 Fri, 23 Aug 2013 18:02:37 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201308231802.r7NI2btZ096033@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Fri, 23 Aug 2013 18:02:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r254725 - stable/9/contrib/llvm/tools/clang/lib/Sema
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Aug 2013 18:02:38 -0000

Author: dim
Date: Fri Aug 23 18:02:37 2013
New Revision: 254725
URL: http://svnweb.freebsd.org/changeset/base/254725

Log:
  MFC r254581:
  
  Pull in r188716 from upstream clang trunk:
  
    PR16727: don't try to evaluate a potentially value-dependent
    expression when checking for missing parens in &&/|| expressions.
  
  This fixes an assertion encountered when building the lang/sdcc port.
  
  Reported by:	kwm

Modified:
  stable/9/contrib/llvm/tools/clang/lib/Sema/SemaExpr.cpp
Directory Properties:
  stable/9/contrib/llvm/   (props changed)
  stable/9/contrib/llvm/tools/clang/   (props changed)

Modified: stable/9/contrib/llvm/tools/clang/lib/Sema/SemaExpr.cpp
==============================================================================
--- stable/9/contrib/llvm/tools/clang/lib/Sema/SemaExpr.cpp	Fri Aug 23 18:01:58 2013	(r254724)
+++ stable/9/contrib/llvm/tools/clang/lib/Sema/SemaExpr.cpp	Fri Aug 23 18:02:37 2013	(r254725)
@@ -8884,14 +8884,16 @@ EmitDiagnosticForLogicalAndInLogicalOr(S
 /// 'true'.
 static bool EvaluatesAsTrue(Sema &S, Expr *E) {
   bool Res;
-  return E->EvaluateAsBooleanCondition(Res, S.getASTContext()) && Res;
+  return !E->isValueDependent() &&
+         E->EvaluateAsBooleanCondition(Res, S.getASTContext()) && Res;
 }
 
 /// \brief Returns true if the given expression can be evaluated as a constant
 /// 'false'.
 static bool EvaluatesAsFalse(Sema &S, Expr *E) {
   bool Res;
-  return E->EvaluateAsBooleanCondition(Res, S.getASTContext()) && !Res;
+  return !E->isValueDependent() &&
+         E->EvaluateAsBooleanCondition(Res, S.getASTContext()) && !Res;
 }
 
 /// \brief Look for '&&' in the left hand of a '||' expr.