From owner-svn-src-head@FreeBSD.ORG  Wed Nov 14 18:54:08 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id A97B4BAE;
 Wed, 14 Nov 2012 18:54:08 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 8E1108FC08;
 Wed, 14 Nov 2012 18:54:08 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAEIs8kr030062;
 Wed, 14 Nov 2012 18:54:08 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAEIs8kl030061;
 Wed, 14 Nov 2012 18:54:08 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201211141854.qAEIs8kl030061@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Wed, 14 Nov 2012 18:54:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r243037 - head/sys/dev/aic7xxx/aicasm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Nov 2012 18:54:08 -0000

Author: dim
Date: Wed Nov 14 18:54:08 2012
New Revision: 243037
URL: http://svnweb.freebsd.org/changeset/base/243037

Log:
  Fix a bug in aicasm_gram.y, noted by a newer clang 3.2 snapshot: it
  compared an enum scope_type against a yacc-generated define, so the
  condition would always be false.
  
  MFC after:	3 days

Modified:
  head/sys/dev/aic7xxx/aicasm/aicasm_gram.y

Modified: head/sys/dev/aic7xxx/aicasm/aicasm_gram.y
==============================================================================
--- head/sys/dev/aic7xxx/aicasm/aicasm_gram.y	Wed Nov 14 18:52:37 2012	(r243036)
+++ head/sys/dev/aic7xxx/aicasm/aicasm_gram.y	Wed Nov 14 18:54:08 2012	(r243037)
@@ -1076,7 +1076,7 @@ conditional:
 		last_scope = TAILQ_LAST(&scope_context->inner_scope,
 					scope_tailq);
 		if (last_scope == NULL
-		 || last_scope->type == T_ELSE) {
+		 || last_scope->type == SCOPE_ELSE) {
 
 			stop("'else if' without leading 'if'", EX_DATAERR);
 			/* NOTREACHED */