Skip to content

Commit

Permalink
[ThinLTO] Fix crash when importing an opaque type
Browse files Browse the repository at this point in the history
It seems that because ThinLTO does not import the full module,
some invariant of the type mapper are broken.

In Monolithic LTO, we import every globals: when calling
IRLinker::copyFunctionProto() on @foo(), we end-up calling
TypeMapTy::get(FTy) on the type of @foo(), which will map
%0 and record the destination as opaque.

ThinLTO skips this because @foo is not imported and goes directly
to the next stage.

Next we call computeTypeMapping() that map the types for each
globals, and ends up checking for type isomorphism, and may add
type mapping. However it doesn't record if there was an opaque
destination type that was resolved.

Instead of lazily "discovering" opaque type in the destination
module on the go, we change the TypeFinder to eagerly record all
types and not only the named ones.

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

llvm-svn: 287453
  • Loading branch information
joker-eph committed Nov 19, 2016
1 parent 98bdbda commit fec2158
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 1 deletion.
2 changes: 1 addition & 1 deletion llvm/lib/Linker/IRMover.cpp
Expand Up @@ -1350,7 +1350,7 @@ bool IRMover::IdentifiedStructTypeSet::hasType(StructType *Ty) {

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);
Expand Down
15 changes: 15 additions & 0 deletions llvm/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
}
27 changes: 27 additions & 0 deletions llvm/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
}

0 comments on commit fec2158

Please sign in to comment.