<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="Generator" content="Microsoft Word 14 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
@font-face
{font-family:Tahoma;
panose-1:2 11 6 4 3 5 4 4 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
margin-bottom:.0001pt;
font-size:12.0pt;
font-family:"Times New Roman","serif";}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:purple;
text-decoration:underline;}
p.MsoPlainText, li.MsoPlainText, div.MsoPlainText
{mso-style-priority:99;
mso-style-link:"Plain Text Char";
margin:0cm;
margin-bottom:.0001pt;
font-size:11.0pt;
font-family:"Calibri","sans-serif";
mso-fareast-language:EN-US;}
span.EmailStyle17
{mso-style-type:personal-reply;
font-family:"Calibri","sans-serif";
color:#1F497D;}
span.PlainTextChar
{mso-style-name:"Plain Text Char";
mso-style-priority:99;
mso-style-link:"Plain Text";
font-family:"Calibri","sans-serif";}
.MsoChpDefault
{mso-style-type:export-only;
font-family:"Calibri","sans-serif";
mso-fareast-language:EN-US;}
@page WordSection1
{size:612.0pt 792.0pt;
margin:72.0pt 72.0pt 72.0pt 72.0pt;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]-->
</head>
<body lang="EN-GB" link="blue" vlink="purple">
<div class="WordSection1">
<p class="MsoPlainText">It seems like the following change causes the failures:<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">diff --git a/lib/Parse/ParseExpr.cpp b/lib/Parse/ParseExpr.cpp<o:p></o:p></p>
<p class="MsoPlainText">index 4dcdfbf..e1439d6 100644<o:p></o:p></p>
<p class="MsoPlainText">--- a/lib/Parse/ParseExpr.cpp<o:p></o:p></p>
<p class="MsoPlainText">+++ b/lib/Parse/ParseExpr.cpp<o:p></o:p></p>
<p class="MsoPlainText">@@ -2379,10 +2427,13 @@ Parser::ParseParenExpression(ParenParseOption &ExprType, bool stopIfCastExpr,<o:p></o:p></p>
<p class="MsoPlainText"> }<o:p></o:p></p>
<p class="MsoPlainText"><o:p></o:p></p>
<p class="MsoPlainText"> // Parse the cast-expression that follows it next.<o:p></o:p></p>
<p class="MsoPlainText">+ // isVectorLiteral = true will make sure we don't parse any<o:p></o:p></p>
<p class="MsoPlainText">+ // Postfix expression yet<o:p></o:p></p>
<p class="MsoPlainText"> // TODO: For cast expression with CastTy.<o:p></o:p></p>
<p class="MsoPlainText"> Result = ParseCastExpression(/*isUnaryExpression=*/false,<o:p></o:p></p>
<p class="MsoPlainText"> /*isAddressOfOperand=*/false,<o:p></o:p></p>
<p class="MsoPlainText">- /*isTypeCast=*/IsTypeCast);<o:p></o:p></p>
<p class="MsoPlainText">+ /*isTypeCast=*/IsTypeCast,<o:p></o:p></p>
<p class="MsoPlainText">+ /*isVectorLiteral=*/true);<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">Although it appears in the review as well, but did you intend to change this?<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">Just FYI, passing "make check-clang" is a minimal testing requirement for Clang changes. Could you, please, try to verify it for your future commits. ;)<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">Thanks!<o:p></o:p></p>
<p class="MsoPlainText">Anastasia<o:p></o:p></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D"><o:p> </o:p></span></p>
<p class="MsoNormal"><b><span lang="EN-US" style="font-size:10.0pt;font-family:"Tahoma","sans-serif"">From:</span></b><span lang="EN-US" style="font-size:10.0pt;font-family:"Tahoma","sans-serif""> cfe-commits [mailto:cfe-commits-bounces@lists.llvm.org]
<b>On Behalf Of </b>Egor Churaev via cfe-commits<br>
<b>Sent:</b> 29 March 2017 06:51<br>
<b>To:</b> Dean Michael Berris<br>
<b>Cc:</b> cfe-commits@lists.llvm.org<br>
<b>Subject:</b> Re: r298976 - [OpenCL] Added parsing for OpenCL vector types.<o:p></o:p></span></p>
<p class="MsoNormal"><o:p> </o:p></p>
<div>
<p class="MsoNormal">I see it. I'm reverting this patch and I'll investigate why it has happend.<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
<div>
<p class="MsoNormal">2017-03-29 8:43 GMT+03:00 Dean Michael Berris <<a href="mailto:dberris@google.com" target="_blank">dberris@google.com</a>>:<o:p></o:p></p>
<div>
<p class="MsoNormal">This seems to have broken multiple builds.<o:p></o:p></p>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
<div>
<div>
<p class="MsoNormal">On Wed, Mar 29, 2017 at 4:20 PM Egor Churaev via cfe-commits <<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>> wrote:<o:p></o:p></p>
</div>
<blockquote style="border:none;border-left:solid #CCCCCC 1.0pt;padding:0cm 0cm 0cm 6.0pt;margin-left:4.8pt;margin-right:0cm">
<p class="MsoNormal">Author: echuraev<br>
Date: Wed Mar 29 00:08:18 2017<br>
New Revision: 298976<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=298976&view=rev" target="_blank">
http://llvm.org/viewvc/llvm-project?rev=298976&view=rev</a><br>
Log:<br>
[OpenCL] Added parsing for OpenCL vector types.<br>
<br>
Reviewers: cfe-commits, Anastasia<br>
<br>
Reviewed By: Anastasia<br>
<br>
Subscribers: yaxunl, bader<br>
<br>
Differential Revision: <a href="https://reviews.llvm.org/D31183" target="_blank">
https://reviews.llvm.org/D31183</a><br>
<br>
Added:<br>
cfe/trunk/test/Parser/<a href="http://vector-cast-define.cl" target="_blank">vector-cast-define.cl</a><br>
Modified:<br>
cfe/trunk/include/clang/Parse/Parser.h<br>
cfe/trunk/lib/Parse/ParseExpr.cpp<br>
<br>
Modified: cfe/trunk/include/clang/Parse/Parser.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Parse/Parser.h?rev=298976&r1=298975&r2=298976&view=diff" target="_blank">
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Parse/Parser.h?rev=298976&r1=298975&r2=298976&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Parse/Parser.h (original)<br>
+++ cfe/trunk/include/clang/Parse/Parser.h Wed Mar 29 00:08:18 2017<br>
@@ -1449,10 +1449,12 @@ private:<br>
ExprResult ParseCastExpression(bool isUnaryExpression,<br>
bool isAddressOfOperand,<br>
bool &NotCastExpr,<br>
- TypeCastState isTypeCast);<br>
+ TypeCastState isTypeCast,<br>
+ bool isVectorLiteral = false);<br>
ExprResult ParseCastExpression(bool isUnaryExpression,<br>
bool isAddressOfOperand = false,<br>
- TypeCastState isTypeCast = NotTypeCast);<br>
+ TypeCastState isTypeCast = NotTypeCast,<br>
+ bool isVectorLiteral = false);<br>
<br>
/// Returns true if the next token cannot start an expression.<br>
bool isNotExpressionStart();<br>
<br>
Modified: cfe/trunk/lib/Parse/ParseExpr.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseExpr.cpp?rev=298976&r1=298975&r2=298976&view=diff" target="_blank">
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseExpr.cpp?rev=298976&r1=298975&r2=298976&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Parse/ParseExpr.cpp (original)<br>
+++ cfe/trunk/lib/Parse/ParseExpr.cpp Wed Mar 29 00:08:18 2017<br>
@@ -473,12 +473,14 @@ Parser::ParseRHSOfBinaryExpression(ExprR<br>
///<br>
ExprResult Parser::ParseCastExpression(bool isUnaryExpression,<br>
bool isAddressOfOperand,<br>
- TypeCastState isTypeCast) {<br>
+ TypeCastState isTypeCast,<br>
+ bool isVectorLiteral) {<br>
bool NotCastExpr;<br>
ExprResult Res = ParseCastExpression(isUnaryExpression,<br>
isAddressOfOperand,<br>
NotCastExpr,<br>
- isTypeCast);<br>
+ isTypeCast,<br>
+ isVectorLiteral);<br>
if (NotCastExpr)<br>
Diag(Tok, diag::err_expected_expression);<br>
return Res;<br>
@@ -694,7 +696,8 @@ class CastExpressionIdValidator : public<br>
ExprResult Parser::ParseCastExpression(bool isUnaryExpression,<br>
bool isAddressOfOperand,<br>
bool &NotCastExpr,<br>
- TypeCastState isTypeCast) {<br>
+ TypeCastState isTypeCast,<br>
+ bool isVectorLiteral) {<br>
ExprResult Res;<br>
tok::TokenKind SavedKind = Tok.getKind();<br>
NotCastExpr = false;<br>
@@ -722,6 +725,9 @@ ExprResult Parser::ParseCastExpression(b<br>
Res = ParseParenExpression(ParenExprType, false/*stopIfCastExr*/,<br>
isTypeCast == IsTypeCast, CastTy, RParenLoc);<br>
<br>
+ if (isVectorLiteral)<br>
+ return Res;<br>
+<br>
switch (ParenExprType) {<br>
case SimpleExpr: break; // Nothing else to do.<br>
case CompoundStmt: break; // Nothing else to do.<br>
@@ -2350,6 +2356,48 @@ Parser::ParseParenExpression(ParenParseO<br>
return ParseCompoundLiteralExpression(Ty.get(), OpenLoc, RParenLoc);<br>
}<br>
<br>
+ if (Tok.is(tok::l_paren)) {<br>
+ // This could be OpenCL vector Literals<br>
+ if (getLangOpts().OpenCL)<br>
+ {<br>
+ TypeResult Ty;<br>
+ {<br>
+ InMessageExpressionRAIIObject InMessage(*this, false);<br>
+ Ty = Actions.ActOnTypeName(getCurScope(), DeclaratorInfo);<br>
+ }<br>
+ if(Ty.isInvalid())<br>
+ {<br>
+ return ExprError();<br>
+ }<br>
+ QualType QT = Ty.get().get().getCanonicalType();<br>
+ if (QT->isVectorType())<br>
+ {<br>
+ // We parsed '(' vector-type-name ')' followed by '('<br>
+<br>
+ // Parse the cast-expression that follows it next.<br>
+ // isVectorLiteral = true will make sure we don't parse any<br>
+ // Postfix expression yet<br>
+ Result = ParseCastExpression(/*isUnaryExpression=*/false,<br>
+ /*isAddressOfOperand=*/false,<br>
+ /*isTypeCast=*/IsTypeCast,<br>
+ /*isVectorLiteral=*/true);<br>
+<br>
+ if (!Result.isInvalid()) {<br>
+ Result = Actions.ActOnCastExpr(getCurScope(), OpenLoc,<br>
+ DeclaratorInfo, CastTy,<br>
+ RParenLoc, Result.get());<br>
+ }<br>
+<br>
+ // After we performed the cast we can check for postfix-expr pieces.<br>
+ if (!Result.isInvalid()) {<br>
+ Result = ParsePostfixExpressionSuffix(Result);<br>
+ }<br>
+<br>
+ return Result;<br>
+ }<br>
+ }<br>
+ }<br>
+<br>
if (ExprType == CastExpr) {<br>
// We parsed '(' type-name ')' and the thing after it wasn't a '{'.<br>
<br>
@@ -2379,10 +2427,13 @@ Parser::ParseParenExpression(ParenParseO<br>
}<br>
<br>
// Parse the cast-expression that follows it next.<br>
+ // isVectorLiteral = true will make sure we don't parse any<br>
+ // Postfix expression yet<br>
// TODO: For cast expression with CastTy.<br>
Result = ParseCastExpression(/*isUnaryExpression=*/false,<br>
/*isAddressOfOperand=*/false,<br>
- /*isTypeCast=*/IsTypeCast);<br>
+ /*isTypeCast=*/IsTypeCast,<br>
+ /*isVectorLiteral=*/true);<br>
if (!Result.isInvalid()) {<br>
Result = Actions.ActOnCastExpr(getCurScope(), OpenLoc,<br>
DeclaratorInfo, CastTy,<br>
<br>
Added: cfe/trunk/test/Parser/<a href="http://vector-cast-define.cl" target="_blank">vector-cast-define.cl</a><br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Parser/vector-cast-define.cl?rev=298976&view=auto" target="_blank">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Parser/vector-cast-define.cl?rev=298976&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/Parser/<a href="http://vector-cast-define.cl" target="_blank">vector-cast-define.cl</a> (added)<br>
+++ cfe/trunk/test/Parser/<a href="http://vector-cast-define.cl" target="_blank">vector-cast-define.cl</a> Wed Mar 29 00:08:18 2017<br>
@@ -0,0 +1,10 @@<br>
+// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only<br>
+// expected-no-diagnostics<br>
+<br>
+typedef int int3 __attribute__((ext_vector_type(3)));<br>
+<br>
+void test()<br>
+{<br>
+ int index = (int3)(1, 2, 3).x * (int3)(3, 2, 1).y;<br>
+}<br>
+<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><o:p></o:p></p>
</blockquote>
</div>
</div>
<p class="MsoNormal"><br>
<br clear="all">
<o:p></o:p></p>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<p class="MsoNormal">-- <o:p></o:p></p>
<div>
<div>
<p class="MsoNormal">Best regards,<o:p></o:p></p>
<div>
<p class="MsoNormal">Egor Churaev<o:p></o:p></p>
</div>
</div>
</div>
</div>
</div>
</body>
</html>