From d72163947a531249d2b3cc0a95154cc9d43b2d46 Mon Sep 17 00:00:00 2001
From: Reid Kleckner <rnk@google.com>
Date: Mon, 1 Jul 2019 22:43:39 +0000
Subject: [PATCH] [PGO] Update ICP pass for recent byval type changes

Fixes verifier errors encountered in PR42413.

Reviewers: xur, t.p.northover, inglorion, gbiv, george.burgess.iv

Differential Revision: https://reviews.llvm.org/D63842

llvm-svn: 364861
---
 llvm/lib/Transforms/Utils/CallPromotionUtils.cpp   |  9 +++++
 .../PGOProfile/indirect_call_promotion_byval.ll    | 47 ++++++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 llvm/test/Transforms/PGOProfile/indirect_call_promotion_byval.ll

diff --git a/llvm/lib/Transforms/Utils/CallPromotionUtils.cpp b/llvm/lib/Transforms/Utils/CallPromotionUtils.cpp
index 1cb8835..f04d76e 100644
--- a/llvm/lib/Transforms/Utils/CallPromotionUtils.cpp
+++ b/llvm/lib/Transforms/Utils/CallPromotionUtils.cpp
@@ -412,6 +412,15 @@ Instruction *llvm::promoteCall(CallSite CS, Function *Callee,
       // Remove any incompatible attributes for the argument.
       AttrBuilder ArgAttrs(CallerPAL.getParamAttributes(ArgNo));
       ArgAttrs.remove(AttributeFuncs::typeIncompatible(FormalTy));
+
+      // If byval is used, this must be a pointer type, and the byval type must
+      // match the element type. Update it if present.
+      if (ArgAttrs.getByValType()) {
+        Type *NewTy = Callee->getParamByValType(ArgNo);
+        ArgAttrs.addByValAttr(
+            NewTy ? NewTy : cast<PointerType>(FormalTy)->getElementType());
+      }
+
       NewArgAttrs.push_back(AttributeSet::get(Ctx, ArgAttrs));
       AttributeChanged = true;
     } else
diff --git a/llvm/test/Transforms/PGOProfile/indirect_call_promotion_byval.ll b/llvm/test/Transforms/PGOProfile/indirect_call_promotion_byval.ll
new file mode 100644
index 0000000..9664d20
--- /dev/null
+++ b/llvm/test/Transforms/PGOProfile/indirect_call_promotion_byval.ll
@@ -0,0 +1,47 @@
+; RUN: opt < %s -pgo-icall-prom -S -icp-total-percent-threshold=10 | FileCheck %s
+; RUN: opt < %s -passes=pgo-icall-prom -S -icp-total-percent-threshold=10 | FileCheck %s
+
+; PR42413: Previously the call promotion code did not correctly update the byval
+; attribute. Check that it does. This situation can come up in LTO scenarios
+; where struct types end up not matching.
+
+target triple = "i686-unknown-linux-gnu"
+
+%struct.Foo.1 = type { i32 }
+%struct.Foo.2 = type { i32 }
+
+@foo = common global i32 (%struct.Foo.2*)* null, align 8
+
+define i32 @func4(%struct.Foo.1* byval(%struct.Foo.1) %p) {
+entry:
+  %gep = getelementptr inbounds %struct.Foo.1, %struct.Foo.1* %p, i32 0, i32 0
+  %v = load i32, i32* %gep
+  ret i32 %v
+}
+
+define i32 @func5(%struct.Foo.1* byval %p) {
+entry:
+  %gep = getelementptr inbounds %struct.Foo.1, %struct.Foo.1* %p, i32 0, i32 0
+  %v = load i32, i32* %gep
+  ret i32 %v
+}
+
+define i32 @bar(%struct.Foo.2* %f2) {
+entry:
+  %tmp = load i32 (%struct.Foo.2*)*, i32 (%struct.Foo.2*)** @foo, align 8
+  %call = call i32 %tmp(%struct.Foo.2* byval(%struct.Foo.2) %f2), !prof !1
+  ret i32 %call
+}
+
+!1 = !{!"VP", i32 0, i64 3000, i64 7651369219802541373, i64 1000, i64 3667884930908592509, i64 1000}
+
+
+; CHECK: define i32 @bar(%struct.Foo.2* %f2)
+;     Cast %struct.Foo.2* to %struct.Foo.1* and use byval(%struct.Foo.2).
+; CHECK: %[[cast:[^ ]*]] = bitcast %struct.Foo.2* %f2 to %struct.Foo.1*
+; CHECK: call i32 @func4(%struct.Foo.1* byval(%struct.Foo.1) %[[cast]])
+;     Same but when callee doesn't have explicit byval type.
+; CHECK: %[[cast:[^ ]*]] = bitcast %struct.Foo.2* %f2 to %struct.Foo.1*
+; CHECK: call i32 @func5(%struct.Foo.1* byval(%struct.Foo.1) %[[cast]])
+;     Original call stays the same.
+; CHECK: call i32 %tmp(%struct.Foo.2* byval(%struct.Foo.2) %f2)
-- 
2.7.4