From 556ffb7806e3371f882d3aa502fb5bdc66e4ca8b Mon Sep 17 00:00:00 2001 From: David Blaikie Date: Thu, 16 Apr 2015 23:24:52 +0000 Subject: [PATCH] [opaque pointer types] Explicit non-pointer type for call expressions (migration for recent LLVM change to textual IR for calls) llvm-svn: 235146 --- polly/lib/Analysis/ScopDetectionDiagnostic.cpp | 2 +- polly/test/Isl/CodeGen/simple_nonaffine_loop.ll | 2 +- polly/test/Isl/CodeGen/single_do_loop_int_max_iterations.ll | 2 +- polly/test/Isl/CodeGen/single_do_loop_scev_replace.ll | 2 +- .../2012-04-16-Trivially-vectorizable-loops.ll | 6 +++--- polly/test/ScopInfo/Alias-0.ll | 2 +- polly/test/ScopInfo/Alias-1.ll | 2 +- polly/test/ScopInfo/escaping_empty_scop.ll | 2 +- polly/test/ScopInfo/max-loop-depth.ll | 2 +- polly/test/ScopInfo/simple_nonaffine_loop_not.ll | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/polly/lib/Analysis/ScopDetectionDiagnostic.cpp b/polly/lib/Analysis/ScopDetectionDiagnostic.cpp index 07c2c75039a0..b4509b242be1 100644 --- a/polly/lib/Analysis/ScopDetectionDiagnostic.cpp +++ b/polly/lib/Analysis/ScopDetectionDiagnostic.cpp @@ -75,7 +75,7 @@ void getDebugLocation(const Region *R, unsigned &LineBegin, unsigned &LineEnd, DIScope Scope = cast(DL.getScope()); if (FileName.empty()) - FileName = Scope.getFilename(); + FileName = Scope->getFilename(); unsigned NewLine = DL.getLine(); diff --git a/polly/test/Isl/CodeGen/simple_nonaffine_loop.ll b/polly/test/Isl/CodeGen/simple_nonaffine_loop.ll index b7273a97203f..45c3af26d9a8 100644 --- a/polly/test/Isl/CodeGen/simple_nonaffine_loop.ll +++ b/polly/test/Isl/CodeGen/simple_nonaffine_loop.ll @@ -47,7 +47,7 @@ for.end: ; preds = %for.body %idxprom3 = sext i32 %mul2 to i64 %arrayidx4 = getelementptr inbounds [1048576 x i32], [1048576 x i32]* %A, i64 0, i64 %idxprom3 %2 = load i32, i32* %arrayidx4, align 16 - %call5 = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([17 x i8], [17 x i8]* @.str, i64 0, i64 0), i32 %2) nounwind + %call5 = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([17 x i8], [17 x i8]* @.str, i64 0, i64 0), i32 %2) nounwind ret i32 0 } diff --git a/polly/test/Isl/CodeGen/single_do_loop_int_max_iterations.ll b/polly/test/Isl/CodeGen/single_do_loop_int_max_iterations.ll index 6892e8324fd7..59ef3867c7bc 100644 --- a/polly/test/Isl/CodeGen/single_do_loop_int_max_iterations.ll +++ b/polly/test/Isl/CodeGen/single_do_loop_int_max_iterations.ll @@ -71,7 +71,7 @@ entry: call void @single_do_loop_int_max_iterations() %tmp = load %struct._IO_FILE*, %struct._IO_FILE** @stdout ; <%struct._IO_FILE*> [#uses=1] %tmp1 = load i32, i32* getelementptr inbounds ([20 x i32], [20 x i32]* @A, i32 0, i32 0) ; [#uses=1] - %call = call i32 (%struct._IO_FILE*, i8*, ...)* @fprintf(%struct._IO_FILE* %tmp, i8* getelementptr inbounds ([11 x i8], [11 x i8]* @.str, i32 0, i32 0), i32 %tmp1) ; [#uses=0] + %call = call i32 (%struct._IO_FILE*, i8*, ...) @fprintf(%struct._IO_FILE* %tmp, i8* getelementptr inbounds ([11 x i8], [11 x i8]* @.str, i32 0, i32 0), i32 %tmp1) ; [#uses=0] %tmp2 = load i32, i32* getelementptr inbounds ([20 x i32], [20 x i32]* @A, i32 0, i32 0) ; [#uses=1] %cmp = icmp eq i32 %tmp2, 2147483646 ; [#uses=1] br i1 %cmp, label %if.then, label %if.else diff --git a/polly/test/Isl/CodeGen/single_do_loop_scev_replace.ll b/polly/test/Isl/CodeGen/single_do_loop_scev_replace.ll index ca43356e35c1..c157b598e99b 100644 --- a/polly/test/Isl/CodeGen/single_do_loop_scev_replace.ll +++ b/polly/test/Isl/CodeGen/single_do_loop_scev_replace.ll @@ -71,7 +71,7 @@ entry: call void @single_do_loop_scev_replace() %tmp = load %struct._IO_FILE*, %struct._IO_FILE** @stdout ; <%struct._IO_FILE*> [#uses=1] %tmp1 = load i32, i32* getelementptr inbounds ([40 x i32], [40 x i32]* @A, i32 0, i32 0) ; [#uses=1] - %call = call i32 (%struct._IO_FILE*, i8*, ...)* @fprintf(%struct._IO_FILE* %tmp, i8* getelementptr inbounds ([11 x i8], [11 x i8]* @.str, i32 0, i32 0), i32 %tmp1) ; [#uses=0] + %call = call i32 (%struct._IO_FILE*, i8*, ...) @fprintf(%struct._IO_FILE* %tmp, i8* getelementptr inbounds ([11 x i8], [11 x i8]* @.str, i32 0, i32 0), i32 %tmp1) ; [#uses=0] %tmp2 = load i32, i32* getelementptr inbounds ([40 x i32], [40 x i32]* @A, i32 0, i64 38) ; [#uses=1] %cmp = icmp eq i32 %tmp2, 19 ; [#uses=1] br i1 %cmp, label %if.then, label %if.else diff --git a/polly/test/ScheduleOptimizer/2012-04-16-Trivially-vectorizable-loops.ll b/polly/test/ScheduleOptimizer/2012-04-16-Trivially-vectorizable-loops.ll index 6e2b05855c29..55d7bd615b18 100644 --- a/polly/test/ScheduleOptimizer/2012-04-16-Trivially-vectorizable-loops.ll +++ b/polly/test/ScheduleOptimizer/2012-04-16-Trivially-vectorizable-loops.ll @@ -94,14 +94,14 @@ for.body3: ; preds = %for.cond1 %arrayidx5 = getelementptr inbounds [1536 x float], [1536 x float]* %arrayidx, i32 0, i64 %idxprom %1 = load float, float* %arrayidx5, align 4 %conv = fpext float %1 to double - %call = call i32 (%struct._IO_FILE*, i8*, ...)* @fprintf(%struct._IO_FILE* %0, i8* getelementptr inbounds ([5 x i8], [5 x i8]* @.str, i32 0, i32 0), double %conv) + %call = call i32 (%struct._IO_FILE*, i8*, ...) @fprintf(%struct._IO_FILE* %0, i8* getelementptr inbounds ([5 x i8], [5 x i8]* @.str, i32 0, i32 0), double %conv) %rem = srem i32 %j.0, 80 %cmp6 = icmp eq i32 %rem, 79 br i1 %cmp6, label %if.then, label %if.end if.then: ; preds = %for.body3 %2 = load %struct._IO_FILE*, %struct._IO_FILE** @stdout, align 8 - %call8 = call i32 (%struct._IO_FILE*, i8*, ...)* @fprintf(%struct._IO_FILE* %2, i8* getelementptr inbounds ([2 x i8], [2 x i8]* @.str1, i32 0, i32 0)) + %call8 = call i32 (%struct._IO_FILE*, i8*, ...) @fprintf(%struct._IO_FILE* %2, i8* getelementptr inbounds ([2 x i8], [2 x i8]* @.str1, i32 0, i32 0)) br label %if.end if.end: ; preds = %if.then, %for.body3 @@ -113,7 +113,7 @@ for.inc: ; preds = %if.end for.end: ; preds = %for.cond1 %3 = load %struct._IO_FILE*, %struct._IO_FILE** @stdout, align 8 - %call9 = call i32 (%struct._IO_FILE*, i8*, ...)* @fprintf(%struct._IO_FILE* %3, i8* getelementptr inbounds ([2 x i8], [2 x i8]* @.str1, i32 0, i32 0)) + %call9 = call i32 (%struct._IO_FILE*, i8*, ...) @fprintf(%struct._IO_FILE* %3, i8* getelementptr inbounds ([2 x i8], [2 x i8]* @.str1, i32 0, i32 0)) br label %for.inc10 for.inc10: ; preds = %for.end diff --git a/polly/test/ScopInfo/Alias-0.ll b/polly/test/ScopInfo/Alias-0.ll index 02a55a7f816e..4a8b1c02021e 100644 --- a/polly/test/ScopInfo/Alias-0.ll +++ b/polly/test/ScopInfo/Alias-0.ll @@ -7,7 +7,7 @@ target triple = "x86_64-linux-gnu" define void @f(i32* nocapture %a, i32* nocapture %b) nounwind { bb.nph: - %0 = tail call i32 (...)* @rnd() nounwind ; [#uses=1] + %0 = tail call i32 (...) @rnd() nounwind ; [#uses=1] %1 = icmp eq i32 %0, 0 ; [#uses=1] %iftmp.0.0 = select i1 %1, i32* %b, i32* %a ; [#uses=2] br label %bb3 diff --git a/polly/test/ScopInfo/Alias-1.ll b/polly/test/ScopInfo/Alias-1.ll index 1b24a90e1294..303f908f2ec0 100644 --- a/polly/test/ScopInfo/Alias-1.ll +++ b/polly/test/ScopInfo/Alias-1.ll @@ -7,7 +7,7 @@ target triple = "x86_64-linux-gnu" define void @f(i32* nocapture %a, i32* nocapture %b) nounwind { bb.nph: - %0 = tail call i32 (...)* @rnd() nounwind ; [#uses=1] + %0 = tail call i32 (...) @rnd() nounwind ; [#uses=1] %1 = icmp eq i32 %0, 0 ; [#uses=1] %sel.b = getelementptr inbounds i32, i32* %b, i64 4 %iftmp.0.0 = select i1 %1, i32* %sel.b, i32* %a ; [#uses=2] diff --git a/polly/test/ScopInfo/escaping_empty_scop.ll b/polly/test/ScopInfo/escaping_empty_scop.ll index aa83bdd5f184..2fbb0e79bcaf 100644 --- a/polly/test/ScopInfo/escaping_empty_scop.ll +++ b/polly/test/ScopInfo/escaping_empty_scop.ll @@ -49,7 +49,7 @@ bb3: ; preds = %bb2 br i1 %exitcond, label %bb1, label %bb5 bb5: ; preds = %bb1 - call void (...)* @g() #2 + call void (...) @g() #2 %add = add i32 %a.0, %a.1 %add2 = add i32 %add, %a.2 ret i32 %add2 diff --git a/polly/test/ScopInfo/max-loop-depth.ll b/polly/test/ScopInfo/max-loop-depth.ll index b62510e51d45..cbf121d3e79e 100644 --- a/polly/test/ScopInfo/max-loop-depth.ll +++ b/polly/test/ScopInfo/max-loop-depth.ll @@ -26,7 +26,7 @@ for.cond: ; preds = %for.inc13, %entry br i1 %cmp, label %for.body, label %for.end15 for.body: ; preds = %for.cond - call void (...)* @bar() #2 + call void (...) @bar() #2 br label %for.cond1 for.cond1: ; preds = %for.inc, %for.body diff --git a/polly/test/ScopInfo/simple_nonaffine_loop_not.ll b/polly/test/ScopInfo/simple_nonaffine_loop_not.ll index 59ce6a6af27b..b6eb08488ce6 100644 --- a/polly/test/ScopInfo/simple_nonaffine_loop_not.ll +++ b/polly/test/ScopInfo/simple_nonaffine_loop_not.ll @@ -30,7 +30,7 @@ for.end: ; preds = %for.body %idxprom3 = sext i32 %mul2 to i64 %arrayidx4 = getelementptr inbounds [1048576 x i32], [1048576 x i32]* %A, i64 0, i64 %idxprom3 %2 = load i32, i32* %arrayidx4, align 16 - %call5 = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([17 x i8], [17 x i8]* @.str, i64 0, i64 0), i32 %2) nounwind + %call5 = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([17 x i8], [17 x i8]* @.str, i64 0, i64 0), i32 %2) nounwind ret i32 0 }