From 3fe815d1256931a46df1f896b941805254b282dd Mon Sep 17 00:00:00 2001
From: Peter Collingbourne <peter@pcc.me.uk>
Date: Mon, 5 Feb 2018 23:46:32 +0000
Subject: [PATCH] LTO: Also include dso-local bit for calls in ThinLTO cache
 key.

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

llvm-svn: 324291
---
 llvm/lib/LTO/LTO.cpp                             |  4 +++-
 llvm/test/LTO/Resolution/X86/cache-dso-local2.ll | 23 +++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 llvm/test/LTO/Resolution/X86/cache-dso-local2.ll

diff --git a/llvm/lib/LTO/LTO.cpp b/llvm/lib/LTO/LTO.cpp
index 02d1c75..177a70c 100644
--- a/llvm/lib/LTO/LTO.cpp
+++ b/llvm/lib/LTO/LTO.cpp
@@ -192,8 +192,10 @@ static void computeCacheKey(
         UsedTypeIds.insert(TT.VFunc.GUID);
       for (auto &TT : FS->type_checked_load_const_vcalls())
         UsedTypeIds.insert(TT.VFunc.GUID);
-      for (auto &ET : FS->calls())
+      for (auto &ET : FS->calls()) {
+        AddUnsigned(ET.first.isDSOLocal());
         AddUsedCfiGlobal(ET.first.getGUID());
+      }
     }
   };
 
diff --git a/llvm/test/LTO/Resolution/X86/cache-dso-local2.ll b/llvm/test/LTO/Resolution/X86/cache-dso-local2.ll
new file mode 100644
index 0000000..3a6c15e
--- /dev/null
+++ b/llvm/test/LTO/Resolution/X86/cache-dso-local2.ll
@@ -0,0 +1,23 @@
+; Tests whether the cache is sensitive to the dso-local bit on called
+; functions.
+; RUN: rm -rf %t.cache
+; RUN: opt -module-hash -module-summary -o %t.bc %s
+; RUN: llvm-lto2 run -o %t.o %t.bc -cache-dir %t.cache \
+; RUN:   -r %t.bc,foo,px \
+; RUN:   -r %t.bc,bar,px
+; RUN: llvm-lto2 run -o %t.o %t.bc -cache-dir %t.cache \
+; RUN:   -r %t.bc,foo,plx \
+; RUN:   -r %t.bc,bar,px
+; RUN: ls %t.cache | count 2
+
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+define weak void @foo() {
+  ret void
+}
+
+define weak void @bar() {
+  call void @foo()
+  ret void
+}
-- 
2.7.4