<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=koi8-r">
</head>
<body dir="auto">
<div>Hi Diana, will fix it in couple hours. <br>
<br>
Best regards,
<div>Alexey Bataev</div>
</div>
<div><br>
7 ΞΟΡΒ. 2016 Η., Χ 12:38, Diana Picus <<a href="mailto:diana.picus@linaro.org">diana.picus@linaro.org</a>> ΞΑΠΙΣΑΜ(Α):<br>
<br>
</div>
<blockquote type="cite">
<div>
<div dir="ltr">Hi,
<div><br>
</div>
<div>This has been breaking the bots for almost an hour. Can you fix/revert?</div>
<div><br>
</div>
<div><a href="http://lab.llvm.org:8011/builders/clang-cmake-armv7-a15/builds/304">http://lab.llvm.org:8011/builders/clang-cmake-armv7-a15/builds/304</a><br>
</div>
<div><a href="http://lab.llvm.org:8011/builders/clang-hexagon-elf/builds/657">http://lab.llvm.org:8011/builders/clang-hexagon-elf/builds/657</a><br>
</div>
<div><a href="http://lab.llvm.org:8011/builders/clang-x86-windows-msvc2015/builds/347">http://lab.llvm.org:8011/builders/clang-x86-windows-msvc2015/builds/347</a><br>
</div>
<div><br>
</div>
<div>Thanks,</div>
<div>Diana</div>
</div>
<div class="gmail_extra"><br>
<div class="gmail_quote">On 7 November 2016 at 10:07, Alexey Bataev via cfe-commits
<span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Author: abataev<br>
Date: Mon Nov 7 02:07:25 2016<br>
New Revision: 286098<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=286098&view=rev" rel="noreferrer" target="_blank">
http://llvm.org/viewvc/llvm-<wbr>project?rev=286098&view=rev</a><br>
Log:<br>
[OPENMP] Fixed capturing of VLA variables.<br>
<br>
After some changes in codegen capturing of VLA variables in OpenMP<br>
regions was broken, causing compiler crash. Patch fixes this issue.<br>
<br>
Modified:<br>
cfe/trunk/lib/CodeGen/CGExpr.<wbr>cpp<br>
cfe/trunk/lib/CodeGen/<wbr>CGStmtOpenMP.cpp<br>
cfe/trunk/test/OpenMP/<wbr>parallel_codegen.cpp<br>
<br>
Modified: cfe/trunk/lib/CodeGen/CGExpr.<wbr>cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGExpr.cpp?rev=286098&r1=286097&r2=286098&view=diff" rel="noreferrer" target="_blank">
http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/lib/CodeGen/<wbr>CGExpr.cpp?rev=286098&r1=<wbr>286097&r2=286098&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/lib/CodeGen/CGExpr.<wbr>cpp (original)<br>
+++ cfe/trunk/lib/CodeGen/CGExpr.<wbr>cpp Mon Nov 7 02:07:25 2016<br>
@@ -2127,12 +2127,11 @@ LValue CodeGenFunction::<wbr>EmitDeclRefLValu<br>
if (auto *FD = LambdaCaptureFields.lookup(VD)<wbr>)<br>
return EmitCapturedFieldLValue(*this, FD, CXXABIThisValue);<br>
else if (CapturedStmtInfo) {<br>
- auto it = LocalDeclMap.find(VD);<br>
- if (it != LocalDeclMap.end()) {<br>
- if (auto RefTy = VD->getType()->getAs<<wbr>ReferenceType>()) {<br>
- return EmitLoadOfReferenceLValue(it-><wbr>second, RefTy);<br>
- }<br>
- return MakeAddrLValue(it->second, T);<br>
+ auto I = LocalDeclMap.find(VD);<br>
+ if (I != LocalDeclMap.end()) {<br>
+ if (auto RefTy = VD->getType()->getAs<<wbr>ReferenceType>())<br>
+ return EmitLoadOfReferenceLValue(I-><wbr>second, RefTy);<br>
+ return MakeAddrLValue(I->second, T);<br>
}<br>
LValue CapLVal =<br>
EmitCapturedFieldLValue(*this, CapturedStmtInfo->lookup(VD),<br>
<br>
Modified: cfe/trunk/lib/CodeGen/<wbr>CGStmtOpenMP.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGStmtOpenMP.cpp?rev=286098&r1=286097&r2=286098&view=diff" rel="noreferrer" target="_blank">
http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/lib/CodeGen/<wbr>CGStmtOpenMP.cpp?rev=286098&<wbr>r1=286097&r2=286098&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/lib/CodeGen/<wbr>CGStmtOpenMP.cpp (original)<br>
+++ cfe/trunk/lib/CodeGen/<wbr>CGStmtOpenMP.cpp Mon Nov 7 02:07:25 2016<br>
@@ -307,7 +307,7 @@ CodeGenFunction::<wbr>GenerateOpenMPCapturedS<br>
if (ArgLVal.getType()-><wbr>isLValueReferenceType()) {<br>
ArgAddr = EmitLoadOfReference(<br>
ArgAddr, ArgLVal.getType()->castAs<<wbr>ReferenceType>());<br>
- } else {<br>
+ } else if (!VarTy-><wbr>isVariablyModifiedType() || !VarTy->isPointerType()) {<br>
assert(ArgLVal.getType()-><wbr>isPointerType());<br>
ArgAddr = EmitLoadOfPointer(<br>
ArgAddr, ArgLVal.getType()->castAs<<wbr>PointerType>());<br>
<br>
Modified: cfe/trunk/test/OpenMP/<wbr>parallel_codegen.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_codegen.cpp?rev=286098&r1=286097&r2=286098&view=diff" rel="noreferrer" target="_blank">
http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/OpenMP/<wbr>parallel_codegen.cpp?rev=<wbr>286098&r1=286097&r2=286098&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/OpenMP/<wbr>parallel_codegen.cpp (original)<br>
+++ cfe/trunk/test/OpenMP/<wbr>parallel_codegen.cpp Mon Nov 7 02:07:25 2016<br>
@@ -10,7 +10,7 @@<br>
// CHECK-DEBUG-DAG: %ident_t = type { i32, i32, i32, i32, i8* }<br>
// CHECK-DEBUG-DAG: [[STR:@.+]] = private unnamed_addr constant [23 x i8] c";unknown;unknown;0;0;;\00"<br>
// CHECK-DEBUG-DAG: [[DEF_LOC_2:@.+]] = private unnamed_addr constant %ident_t { i32 0, i32 2, i32 0, i32 0, i8* getelementptr inbounds ([23 x i8], [23 x i8]* [[STR]], i32 0, i32 0) }<br>
-// CHECK-DEBUG-DAG: [[LOC1:@.+]] = private unnamed_addr constant [{{.+}} x i8] c";{{.*}}parallel_codegen.cpp;<wbr>main;[[@LINE+14]];9;;\00"<br>
+// CHECK-DEBUG-DAG: [[LOC1:@.+]] = private unnamed_addr constant [{{.+}} x i8] c";{{.*}}parallel_codegen.cpp;<wbr>main;[[@LINE+15]];9;;\00"<br>
// CHECK-DEBUG-DAG: [[LOC2:@.+]] = private unnamed_addr constant [{{.+}} x i8] c";{{.*}}parallel_codegen.cpp;<wbr>tmain;[[@LINE+7]];9;;\00"<br>
<br>
template <class T><br>
@@ -24,17 +24,19 @@ int tmain(T argc) {<br>
}<br>
<br>
int main (int argc, char **argv) {<br>
+ int a[argc];<br>
#pragma omp parallel<br>
- foo(argc);<br>
+ foo(a[1]);<br>
return tmain(argv);<br>
}<br>
<br>
// CHECK-LABEL: define {{[a-z\_\b]*[ ]?i32}} @main({{i32[ ]?[a-z]*}} %argc, i8** %argv)<br>
// CHECK: store i32 %argc, i32* [[ARGC_ADDR:%.+]],<br>
-// CHECK: call {{.*}}void (%ident_t*, i32, void (i32*, i32*, ...)*, ...) @__kmpc_fork_call(%ident_t* [[DEF_LOC_2]], i32 1, void (i32*, i32*, ...)* bitcast (void (i32*, i32*, i32*)* [[OMP_OUTLINED:@.+]] to void (i32*, i32*, ...)*), i32* [[ARGC_ADDR]])<br>
+// CHECK: [[VLA:%.+]] = alloca i32, i64 [[VLA_SIZE:%[^,]+]],<br>
+// CHECK: call {{.*}}void (%ident_t*, i32, void (i32*, i32*, ...)*, ...) @__kmpc_fork_call(%ident_t* [[DEF_LOC_2]], i32 2, void (i32*, i32*, ...)* bitcast (void (i32*, i32*, i64, i32*)* [[OMP_OUTLINED:@.+]] to void (i32*, i32*, ...)*), i64 [[VLA_SIZE]], i32*
[[VLA]])<br>
// CHECK-NEXT: [[ARGV:%.+]] = load i8**, i8*** {{%[a-z0-9.]+}}<br>
// CHECK-NEXT: [[RET:%.+]] = call {{[a-z\_\b]*[ ]?i32}} [[TMAIN:@.+tmain.+]](i8** [[ARGV]])<br>
-// CHECK-NEXT: ret i32 [[RET]]<br>
+// CHECK: ret i32<br>
// CHECK-NEXT: }<br>
// CHECK-DEBUG-LABEL: define i32 @main(i32 %argc, i8** %argv)<br>
// CHECK-DEBUG: [[LOC_2_ADDR:%.+]] = alloca %ident_t<br>
@@ -42,30 +44,33 @@ int main (int argc, char **argv) {<br>
// CHECK-DEBUG-NEXT: [[KMPC_DEFAULT_LOC_VOIDPTR:%.+<wbr>]] = bitcast %ident_t* [[DEF_LOC_2]] to i8*<br>
// CHECK-DEBUG-NEXT: call void @llvm.memcpy.p0i8.p0i8.i64(i8* [[KMPC_LOC_VOIDPTR]], i8* [[KMPC_DEFAULT_LOC_VOIDPTR]], i64 24, i32 8, i1 false)<br>
// CHECK-DEBUG: store i32 %argc, i32* [[ARGC_ADDR:%.+]],<br>
+// CHECK-DEBUG: [[VLA:%.+]] = alloca i32, i64 [[VLA_SIZE:%[^,]+]],<br>
// CHECK-DEBUG: [[KMPC_LOC_PSOURCE_REF:%.+]] = getelementptr inbounds %ident_t, %ident_t* [[LOC_2_ADDR]], i32 0, i32 4<br>
// CHECK-DEBUG-NEXT: store i8* getelementptr inbounds ([{{.+}} x i8], [{{.+}} x i8]* [[LOC1]], i32 0, i32 0), i8** [[KMPC_LOC_PSOURCE_REF]]<br>
-// CHECK-DEBUG: call {{.*}}void (%ident_t*, i32, void (i32*, i32*, ...)*, ...) @__kmpc_fork_call(%ident_t* [[LOC_2_ADDR]], i32 1, void (i32*, i32*, ...)* bitcast (void (i32*, i32*, i32*)* [[OMP_OUTLINED:@.+]] to void (i32*, i32*, ...)*), i32* [[ARGC_ADDR]])<br>
+// CHECK-DEBUG: call {{.*}}void (%ident_t*, i32, void (i32*, i32*, ...)*, ...) @__kmpc_fork_call(%ident_t* [[LOC_2_ADDR]], i32 2, void (i32*, i32*, ...)* bitcast (void (i32*, i32*, i64, i32*)* [[OMP_OUTLINED:@.+]] to void (i32*, i32*, ...)*), i64 [[VLA_SIZE]],
i32* [[VLA]])<br>
// CHECK-DEBUG-NEXT: [[ARGV:%.+]] = load i8**, i8*** {{%[a-z0-9.]+}}<br>
// CHECK-DEBUG-NEXT: [[RET:%.+]] = call i32 [[TMAIN:@.+tmain.+]](i8** [[ARGV]])<br>
-// CHECK-DEBUG-NEXT: ret i32 [[RET]]<br>
+// CHECK-DEBUG: ret i32<br>
// CHECK-DEBUG-NEXT: }<br>
<br>
-// CHECK: define internal {{.*}}void [[OMP_OUTLINED]](i32* noalias %.global_tid., i32* noalias %.bound_tid., i32* dereferenceable(4) [[ARGC_ADDR:%[^)]+]])<br>
+// CHECK: define internal {{.*}}void [[OMP_OUTLINED]](i32* noalias %.global_tid., i32* noalias %.bound_tid., i64 [[VLA_SIZE:%.+]], i32* [[VLA_ADDR:%[^)]+]])<br>
// CHECK-SAME: #[[FN_ATTRS:[0-9]+]]<br>
-// CHECK: store i32* [[ARGC_ADDR]], i32** [[ARGC_PTR_ADDR:%.+]],<br>
-// CHECK: [[ARGC_REF:%.+]] = load i32*, i32** [[ARGC_PTR_ADDR]]<br>
-// CHECK-NEXT: [[ARGC:%.+]] = load i32, i32* [[ARGC_REF]]<br>
-// CHECK-NEXT: invoke {{.*}}void [[FOO:@.+foo.+]](i32{{[ ]?[a-z]*}} [[ARGC]])<br>
+// CHECK: store i32* [[VLA_ADDR]], i32** [[VLA_PTR_ADDR:%.+]],<br>
+// CHECK: [[VLA_REF:%.+]] = load i32*, i32** [[VLA_PTR_ADDR]]<br>
+// CHECK: [[VLA_ELEM_REF:%.+]] = getelementptr inbounds i32, i32* [[VLA_REF]], i64 1<br>
+// CHECK-NEXT: [[VLA_ELEM:%.+]] = load i32, i32* [[VLA_ELEM_REF]]<br>
+// CHECK-NEXT: invoke {{.*}}void [[FOO:@.+foo.+]](i32{{[ ]?[a-z]*}} [[VLA_ELEM]])<br>
// CHECK: ret void<br>
// CHECK: call {{.*}}void @{{.+terminate.*|abort}}(<br>
// CHECK-NEXT: unreachable<br>
// CHECK-NEXT: }<br>
-// CHECK-DEBUG: define internal void [[OMP_OUTLINED]](i32* noalias %.global_tid., i32* noalias %.bound_tid., i32* dereferenceable(4) [[ARGC_ADDR:%[^)]+]])<br>
+// CHECK-DEBUG: define internal void [[OMP_OUTLINED]](i32* noalias %.global_tid., i32* noalias %.bound_tid., i64 [[VLA_SIZE:%.+]], i32* [[VLA_ADDR:%[^)]+]])<br>
// CHECK-DEBUG-SAME: #[[FN_ATTRS:[0-9]+]]<br>
-// CHECK-DEBUG: store i32* [[ARGC_ADDR]], i32** [[ARGC_PTR_ADDR:%.+]],<br>
-// CHECK-DEBUG: [[ARGC_REF:%.+]] = load i32*, i32** [[ARGC_PTR_ADDR]]<br>
-// CHECK-DEBUG-NEXT: [[ARGC:%.+]] = load i32, i32* [[ARGC_REF]]<br>
-// CHECK-DEBUG-NEXT: invoke void [[FOO:@.+foo.+]](i32 [[ARGC]])<br>
+// CHECK-DEBUG: store i32* [[VLA_ADDR]], i32** [[VLA_PTR_ADDR:%.+]],<br>
+// CHECK-DEBUG: [[VLA_REF:%.+]] = load i32*, i32** [[VLA_PTR_ADDR]]<br>
+// CHECK-DEBUG: [[VLA_ELEM_REF:%.+]] = getelementptr inbounds i32, i32* [[VLA_REF]], i64 1<br>
+// CHECK-DEBUG-NEXT: [[VLA_ELEM:%.+]] = load i32, i32* [[VLA_ELEM_REF]]<br>
+// CHECK-DEBUG-NEXT: invoke void [[FOO:@.+foo.+]](i32 [[VLA_ELEM]])<br>
// CHECK-DEBUG: ret void<br>
// CHECK-DEBUG: call void @{{.+terminate.*|abort}}(<br>
// CHECK-DEBUG-NEXT: unreachable<br>
<br>
<br>
______________________________<wbr>_________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/cfe-commits</a><br>
</blockquote>
</div>
<br>
</div>
</div>
</blockquote>
</body>
</html>