<div dir="ltr">I see it. I'm reverting this patch and I'll investigate why it has happend.</div><div class="gmail_extra"><br><div class="gmail_quote">2017-03-29 8:43 GMT+03:00 Dean Michael Berris <span dir="ltr"><<a href="mailto:dberris@google.com" target="_blank">dberris@google.com</a>></span>:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">This seems to have broken multiple builds.</div><br><div class="gmail_quote"><div dir="ltr">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:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: echuraev<br class="m_-6435610545246177342gmail_msg">
Date: Wed Mar 29 00:08:18 2017<br class="m_-6435610545246177342gmail_msg">
New Revision: 298976<br class="m_-6435610545246177342gmail_msg">
<br class="m_-6435610545246177342gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=298976&view=rev" rel="noreferrer" class="m_-6435610545246177342gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=298976&view=rev</a><br class="m_-6435610545246177342gmail_msg">
Log:<br class="m_-6435610545246177342gmail_msg">
[OpenCL] Added parsing for OpenCL vector types.<br class="m_-6435610545246177342gmail_msg">
<br class="m_-6435610545246177342gmail_msg">
Reviewers: cfe-commits, Anastasia<br class="m_-6435610545246177342gmail_msg">
<br class="m_-6435610545246177342gmail_msg">
Reviewed By: Anastasia<br class="m_-6435610545246177342gmail_msg">
<br class="m_-6435610545246177342gmail_msg">
Subscribers: yaxunl, bader<br class="m_-6435610545246177342gmail_msg">
<br class="m_-6435610545246177342gmail_msg">
Differential Revision: <a href="https://reviews.llvm.org/D31183" rel="noreferrer" class="m_-6435610545246177342gmail_msg" target="_blank">https://reviews.llvm.org/<wbr>D31183</a><br class="m_-6435610545246177342gmail_msg">
<br class="m_-6435610545246177342gmail_msg">
Added:<br class="m_-6435610545246177342gmail_msg">
cfe/trunk/test/Parser/<a href="http://vector-cast-define.cl" rel="noreferrer" class="m_-6435610545246177342gmail_msg" target="_blank">vector-<wbr>cast-define.cl</a><br class="m_-6435610545246177342gmail_msg">
Modified:<br class="m_-6435610545246177342gmail_msg">
cfe/trunk/include/clang/Parse/<wbr>Parser.h<br class="m_-6435610545246177342gmail_msg">
cfe/trunk/lib/Parse/ParseExpr.<wbr>cpp<br class="m_-6435610545246177342gmail_msg">
<br class="m_-6435610545246177342gmail_msg">
Modified: cfe/trunk/include/clang/Parse/<wbr>Parser.h<br class="m_-6435610545246177342gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Parse/Parser.h?rev=298976&r1=298975&r2=298976&view=diff" rel="noreferrer" class="m_-6435610545246177342gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/include/<wbr>clang/Parse/Parser.h?rev=<wbr>298976&r1=298975&r2=298976&<wbr>view=diff</a><br class="m_-6435610545246177342gmail_msg">
==============================<wbr>==============================<wbr>==================<br class="m_-6435610545246177342gmail_msg">
--- cfe/trunk/include/clang/Parse/<wbr>Parser.h (original)<br class="m_-6435610545246177342gmail_msg">
+++ cfe/trunk/include/clang/Parse/<wbr>Parser.h Wed Mar 29 00:08:18 2017<br class="m_-6435610545246177342gmail_msg">
@@ -1449,10 +1449,12 @@ private:<br class="m_-6435610545246177342gmail_msg">
ExprResult ParseCastExpression(bool isUnaryExpression,<br class="m_-6435610545246177342gmail_msg">
bool isAddressOfOperand,<br class="m_-6435610545246177342gmail_msg">
bool &NotCastExpr,<br class="m_-6435610545246177342gmail_msg">
- TypeCastState isTypeCast);<br class="m_-6435610545246177342gmail_msg">
+ TypeCastState isTypeCast,<br class="m_-6435610545246177342gmail_msg">
+ bool isVectorLiteral = false);<br class="m_-6435610545246177342gmail_msg">
ExprResult ParseCastExpression(bool isUnaryExpression,<br class="m_-6435610545246177342gmail_msg">
bool isAddressOfOperand = false,<br class="m_-6435610545246177342gmail_msg">
- TypeCastState isTypeCast = NotTypeCast);<br class="m_-6435610545246177342gmail_msg">
+ TypeCastState isTypeCast = NotTypeCast,<br class="m_-6435610545246177342gmail_msg">
+ bool isVectorLiteral = false);<br class="m_-6435610545246177342gmail_msg">
<br class="m_-6435610545246177342gmail_msg">
/// Returns true if the next token cannot start an expression.<br class="m_-6435610545246177342gmail_msg">
bool isNotExpressionStart();<br class="m_-6435610545246177342gmail_msg">
<br class="m_-6435610545246177342gmail_msg">
Modified: cfe/trunk/lib/Parse/ParseExpr.<wbr>cpp<br class="m_-6435610545246177342gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseExpr.cpp?rev=298976&r1=298975&r2=298976&view=diff" rel="noreferrer" class="m_-6435610545246177342gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/lib/Parse/<wbr>ParseExpr.cpp?rev=298976&r1=<wbr>298975&r2=298976&view=diff</a><br class="m_-6435610545246177342gmail_msg">
==============================<wbr>==============================<wbr>==================<br class="m_-6435610545246177342gmail_msg">
--- cfe/trunk/lib/Parse/ParseExpr.<wbr>cpp (original)<br class="m_-6435610545246177342gmail_msg">
+++ cfe/trunk/lib/Parse/ParseExpr.<wbr>cpp Wed Mar 29 00:08:18 2017<br class="m_-6435610545246177342gmail_msg">
@@ -473,12 +473,14 @@ Parser::<wbr>ParseRHSOfBinaryExpression(<wbr>ExprR<br class="m_-6435610545246177342gmail_msg">
///<br class="m_-6435610545246177342gmail_msg">
ExprResult Parser::ParseCastExpression(<wbr>bool isUnaryExpression,<br class="m_-6435610545246177342gmail_msg">
bool isAddressOfOperand,<br class="m_-6435610545246177342gmail_msg">
- TypeCastState isTypeCast) {<br class="m_-6435610545246177342gmail_msg">
+ TypeCastState isTypeCast,<br class="m_-6435610545246177342gmail_msg">
+ bool isVectorLiteral) {<br class="m_-6435610545246177342gmail_msg">
bool NotCastExpr;<br class="m_-6435610545246177342gmail_msg">
ExprResult Res = ParseCastExpression(<wbr>isUnaryExpression,<br class="m_-6435610545246177342gmail_msg">
isAddressOfOperand,<br class="m_-6435610545246177342gmail_msg">
NotCastExpr,<br class="m_-6435610545246177342gmail_msg">
- isTypeCast);<br class="m_-6435610545246177342gmail_msg">
+ isTypeCast,<br class="m_-6435610545246177342gmail_msg">
+ isVectorLiteral);<br class="m_-6435610545246177342gmail_msg">
if (NotCastExpr)<br class="m_-6435610545246177342gmail_msg">
Diag(Tok, diag::err_expected_expression)<wbr>;<br class="m_-6435610545246177342gmail_msg">
return Res;<br class="m_-6435610545246177342gmail_msg">
@@ -694,7 +696,8 @@ class CastExpressionIdValidator : public<br class="m_-6435610545246177342gmail_msg">
ExprResult Parser::ParseCastExpression(<wbr>bool isUnaryExpression,<br class="m_-6435610545246177342gmail_msg">
bool isAddressOfOperand,<br class="m_-6435610545246177342gmail_msg">
bool &NotCastExpr,<br class="m_-6435610545246177342gmail_msg">
- TypeCastState isTypeCast) {<br class="m_-6435610545246177342gmail_msg">
+ TypeCastState isTypeCast,<br class="m_-6435610545246177342gmail_msg">
+ bool isVectorLiteral) {<br class="m_-6435610545246177342gmail_msg">
ExprResult Res;<br class="m_-6435610545246177342gmail_msg">
tok::TokenKind SavedKind = Tok.getKind();<br class="m_-6435610545246177342gmail_msg">
NotCastExpr = false;<br class="m_-6435610545246177342gmail_msg">
@@ -722,6 +725,9 @@ ExprResult Parser::ParseCastExpression(b<br class="m_-6435610545246177342gmail_msg">
Res = ParseParenExpression(<wbr>ParenExprType, false/*stopIfCastExr*/,<br class="m_-6435610545246177342gmail_msg">
isTypeCast == IsTypeCast, CastTy, RParenLoc);<br class="m_-6435610545246177342gmail_msg">
<br class="m_-6435610545246177342gmail_msg">
+ if (isVectorLiteral)<br class="m_-6435610545246177342gmail_msg">
+ return Res;<br class="m_-6435610545246177342gmail_msg">
+<br class="m_-6435610545246177342gmail_msg">
switch (ParenExprType) {<br class="m_-6435610545246177342gmail_msg">
case SimpleExpr: break; // Nothing else to do.<br class="m_-6435610545246177342gmail_msg">
case CompoundStmt: break; // Nothing else to do.<br class="m_-6435610545246177342gmail_msg">
@@ -2350,6 +2356,48 @@ Parser::ParseParenExpression(<wbr>ParenParseO<br class="m_-6435610545246177342gmail_msg">
return ParseCompoundLiteralExpression<wbr>(Ty.get(), OpenLoc, RParenLoc);<br class="m_-6435610545246177342gmail_msg">
}<br class="m_-6435610545246177342gmail_msg">
<br class="m_-6435610545246177342gmail_msg">
+ if (Tok.is(tok::l_paren)) {<br class="m_-6435610545246177342gmail_msg">
+ // This could be OpenCL vector Literals<br class="m_-6435610545246177342gmail_msg">
+ if (getLangOpts().OpenCL)<br class="m_-6435610545246177342gmail_msg">
+ {<br class="m_-6435610545246177342gmail_msg">
+ TypeResult Ty;<br class="m_-6435610545246177342gmail_msg">
+ {<br class="m_-6435610545246177342gmail_msg">
+ InMessageExpressionRAIIObject InMessage(*this, false);<br class="m_-6435610545246177342gmail_msg">
+ Ty = Actions.ActOnTypeName(<wbr>getCurScope(), DeclaratorInfo);<br class="m_-6435610545246177342gmail_msg">
+ }<br class="m_-6435610545246177342gmail_msg">
+ if(Ty.isInvalid())<br class="m_-6435610545246177342gmail_msg">
+ {<br class="m_-6435610545246177342gmail_msg">
+ return ExprError();<br class="m_-6435610545246177342gmail_msg">
+ }<br class="m_-6435610545246177342gmail_msg">
+ QualType QT = Ty.get().get().<wbr>getCanonicalType();<br class="m_-6435610545246177342gmail_msg">
+ if (QT->isVectorType())<br class="m_-6435610545246177342gmail_msg">
+ {<br class="m_-6435610545246177342gmail_msg">
+ // We parsed '(' vector-type-name ')' followed by '('<br class="m_-6435610545246177342gmail_msg">
+<br class="m_-6435610545246177342gmail_msg">
+ // Parse the cast-expression that follows it next.<br class="m_-6435610545246177342gmail_msg">
+ // isVectorLiteral = true will make sure we don't parse any<br class="m_-6435610545246177342gmail_msg">
+ // Postfix expression yet<br class="m_-6435610545246177342gmail_msg">
+ Result = ParseCastExpression(/*<wbr>isUnaryExpression=*/false,<br class="m_-6435610545246177342gmail_msg">
+ /*isAddressOfOperand=*/false,<br class="m_-6435610545246177342gmail_msg">
+ /*isTypeCast=*/IsTypeCast,<br class="m_-6435610545246177342gmail_msg">
+ /*isVectorLiteral=*/true);<br class="m_-6435610545246177342gmail_msg">
+<br class="m_-6435610545246177342gmail_msg">
+ if (!Result.isInvalid()) {<br class="m_-6435610545246177342gmail_msg">
+ Result = Actions.ActOnCastExpr(<wbr>getCurScope(), OpenLoc,<br class="m_-6435610545246177342gmail_msg">
+ DeclaratorInfo, CastTy,<br class="m_-6435610545246177342gmail_msg">
+ RParenLoc, Result.get());<br class="m_-6435610545246177342gmail_msg">
+ }<br class="m_-6435610545246177342gmail_msg">
+<br class="m_-6435610545246177342gmail_msg">
+ // After we performed the cast we can check for postfix-expr pieces.<br class="m_-6435610545246177342gmail_msg">
+ if (!Result.isInvalid()) {<br class="m_-6435610545246177342gmail_msg">
+ Result = ParsePostfixExpressionSuffix(<wbr>Result);<br class="m_-6435610545246177342gmail_msg">
+ }<br class="m_-6435610545246177342gmail_msg">
+<br class="m_-6435610545246177342gmail_msg">
+ return Result;<br class="m_-6435610545246177342gmail_msg">
+ }<br class="m_-6435610545246177342gmail_msg">
+ }<br class="m_-6435610545246177342gmail_msg">
+ }<br class="m_-6435610545246177342gmail_msg">
+<br class="m_-6435610545246177342gmail_msg">
if (ExprType == CastExpr) {<br class="m_-6435610545246177342gmail_msg">
// We parsed '(' type-name ')' and the thing after it wasn't a '{'.<br class="m_-6435610545246177342gmail_msg">
<br class="m_-6435610545246177342gmail_msg">
@@ -2379,10 +2427,13 @@ Parser::ParseParenExpression(<wbr>ParenParseO<br class="m_-6435610545246177342gmail_msg">
}<br class="m_-6435610545246177342gmail_msg">
<br class="m_-6435610545246177342gmail_msg">
// Parse the cast-expression that follows it next.<br class="m_-6435610545246177342gmail_msg">
+ // isVectorLiteral = true will make sure we don't parse any<br class="m_-6435610545246177342gmail_msg">
+ // Postfix expression yet<br class="m_-6435610545246177342gmail_msg">
// TODO: For cast expression with CastTy.<br class="m_-6435610545246177342gmail_msg">
Result = ParseCastExpression(/*<wbr>isUnaryExpression=*/false,<br class="m_-6435610545246177342gmail_msg">
/*isAddressOfOperand=*/false,<br class="m_-6435610545246177342gmail_msg">
- /*isTypeCast=*/IsTypeCast);<br class="m_-6435610545246177342gmail_msg">
+ /*isTypeCast=*/IsTypeCast,<br class="m_-6435610545246177342gmail_msg">
+ /*isVectorLiteral=*/true);<br class="m_-6435610545246177342gmail_msg">
if (!Result.isInvalid()) {<br class="m_-6435610545246177342gmail_msg">
Result = Actions.ActOnCastExpr(<wbr>getCurScope(), OpenLoc,<br class="m_-6435610545246177342gmail_msg">
DeclaratorInfo, CastTy,<br class="m_-6435610545246177342gmail_msg">
<br class="m_-6435610545246177342gmail_msg">
Added: cfe/trunk/test/Parser/<a href="http://vector-cast-define.cl" rel="noreferrer" class="m_-6435610545246177342gmail_msg" target="_blank">vector-<wbr>cast-define.cl</a><br class="m_-6435610545246177342gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Parser/vector-cast-define.cl?rev=298976&view=auto" rel="noreferrer" class="m_-6435610545246177342gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/Parser/<wbr>vector-cast-define.cl?rev=<wbr>298976&view=auto</a><br class="m_-6435610545246177342gmail_msg">
==============================<wbr>==============================<wbr>==================<br class="m_-6435610545246177342gmail_msg">
--- cfe/trunk/test/Parser/<a href="http://vector-cast-define.cl" rel="noreferrer" class="m_-6435610545246177342gmail_msg" target="_blank">vector-<wbr>cast-define.cl</a> (added)<br class="m_-6435610545246177342gmail_msg">
+++ cfe/trunk/test/Parser/<a href="http://vector-cast-define.cl" rel="noreferrer" class="m_-6435610545246177342gmail_msg" target="_blank">vector-<wbr>cast-define.cl</a> Wed Mar 29 00:08:18 2017<br class="m_-6435610545246177342gmail_msg">
@@ -0,0 +1,10 @@<br class="m_-6435610545246177342gmail_msg">
+// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only<br class="m_-6435610545246177342gmail_msg">
+// expected-no-diagnostics<br class="m_-6435610545246177342gmail_msg">
+<br class="m_-6435610545246177342gmail_msg">
+typedef int int3 __attribute__((ext_vector_<wbr>type(3)));<br class="m_-6435610545246177342gmail_msg">
+<br class="m_-6435610545246177342gmail_msg">
+void test()<br class="m_-6435610545246177342gmail_msg">
+{<br class="m_-6435610545246177342gmail_msg">
+ int index = (int3)(1, 2, 3).x * (int3)(3, 2, 1).y;<br class="m_-6435610545246177342gmail_msg">
+}<br class="m_-6435610545246177342gmail_msg">
+<br class="m_-6435610545246177342gmail_msg">
<br class="m_-6435610545246177342gmail_msg">
<br class="m_-6435610545246177342gmail_msg">
______________________________<wbr>_________________<br class="m_-6435610545246177342gmail_msg">
cfe-commits mailing list<br class="m_-6435610545246177342gmail_msg">
<a href="mailto:cfe-commits@lists.llvm.org" class="m_-6435610545246177342gmail_msg" target="_blank">cfe-commits@lists.llvm.org</a><br class="m_-6435610545246177342gmail_msg">
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" class="m_-6435610545246177342gmail_msg" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/cfe-commits</a><br class="m_-6435610545246177342gmail_msg">
</blockquote></div>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature" data-smartmail="gmail_signature"><div dir="ltr">Best regards,<div>Egor Churaev</div></div></div>
</div>