[PATCH] D26840: [ThinLTO] Fix crash when importing an opaque type

[Mehdi AMINI via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL287453: [ThinLTO] Fix crash when importing an opaque type (authored by mehdi_amini).

Changed prior to commit:
  https://reviews.llvm.org/D26840?vs=78590&id=78639#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D26840

Files:
  llvm/trunk/lib/Linker/IRMover.cpp
  llvm/trunk/test/ThinLTO/X86/Inputs/import_opaque_type.ll
  llvm/trunk/test/ThinLTO/X86/import_opaque_type.ll


Index: llvm/trunk/test/ThinLTO/X86/import_opaque_type.ll
===================================================================
--- llvm/trunk/test/ThinLTO/X86/import_opaque_type.ll
+++ llvm/trunk/test/ThinLTO/X86/import_opaque_type.ll
@@ -0,0 +1,27 @@
+; Do setup work for all below tests: generate bitcode and combined index
+; RUN: opt -module-summary %s -o %t.bc
+; RUN: opt -module-summary %p/Inputs/import_opaque_type.ll -o %t2.bc
+; RUN: llvm-lto -thinlto-action=thinlink -o %t3.bc %t.bc %t2.bc
+
+; Check that we import correctly the imported type to replace the opaque one here
+; RUN: llvm-lto -thinlto-action=import %t.bc -thinlto-index=%t3.bc -o - | llvm-dis -o - | FileCheck %s
+
+
+target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-apple-macosx10.11.0"
+
+; CHECK: %0 = type { i8 }
+%0 = type opaque
+
+%a = type { %0 * }
+
+declare void @baz()
+define void @foo(%a *) {
+	call void @baz()
+	ret void
+}
+
+define i32 @main() {
+    call void @foo(%a *null)
+	ret i32 0
+}
Index: llvm/trunk/test/ThinLTO/X86/Inputs/import_opaque_type.ll
===================================================================
--- llvm/trunk/test/ThinLTO/X86/Inputs/import_opaque_type.ll
+++ llvm/trunk/test/ThinLTO/X86/Inputs/import_opaque_type.ll
@@ -0,0 +1,15 @@
+target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-apple-macosx10.11.0"
+
+%0 = type { i8 }
+
+%a = type { %0 * }
+
+define void @bar(%a *) {
+	ret void
+}
+
+define void @baz() {
+	call void @bar(%a *null)
+	ret void
+}
Index: llvm/trunk/lib/Linker/IRMover.cpp
===================================================================
--- llvm/trunk/lib/Linker/IRMover.cpp
+++ llvm/trunk/lib/Linker/IRMover.cpp
@@ -1350,7 +1350,7 @@
 
 IRMover::IRMover(Module &M) : Composite(M) {
   TypeFinder StructTypes;
-  StructTypes.run(M, true);
+  StructTypes.run(M, /* OnlyNamed */ false);
   for (StructType *Ty : StructTypes) {
     if (Ty->isOpaque())
       IdentifiedStructTypes.addOpaque(Ty);


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D26840.78639.patch
Type: text/x-patch
Size: 2012 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20161119/cf34960e/attachment.bin>