diff options
author | Duncan P. N. Exon Smith <dexonsmith@apple.com> | 2016-04-08 00:33:44 +0000 |
---|---|---|
committer | Duncan P. N. Exon Smith <dexonsmith@apple.com> | 2016-04-08 00:33:44 +0000 |
commit | 267185ec922b29ddc25684b89ac8fec2d7d027e2 (patch) | |
tree | c19158a055bf27a6d5eded39d96648cfd95a9b44 /llvm/test/Transforms | |
parent | 57bbdaf93703d840103957a131d40d2ce54d2654 (diff) | |
download | bcm5719-llvm-267185ec922b29ddc25684b89ac8fec2d7d027e2.tar.gz bcm5719-llvm-267185ec922b29ddc25684b89ac8fec2d7d027e2.zip |
ValueMapper: Treat LocalAsMetadata more like function-local Values
This is a partial re-commit -- maybe more of a re-implementation -- of
r265631 (reverted in r265637).
This makes RF_IgnoreMissingLocals behave (almost) consistently between
the Value and the Metadata hierarchy. In particular:
- MapValue returns nullptr or "metadata !{}" for missing locals in
MetadataAsValue/LocalAsMetadata bridging paris, depending on
the RF_IgnoreMissingLocals flag.
- MapValue doesn't memoize LocalAsMetadata-related results.
- MapMetadata no longer deals with LocalAsMetadata or
RF_IgnoreMissingLocals at all. (This wasn't in r265631 at all, but
I realized during testing it would make the patch simpler with no
loss of generality.)
r265631 went too far, making both functions universally ignore
RF_IgnoreMissingLocals. This broke building (e.g.) compiler-rt.
Reassociate (and possibly other passes) don't currently maintain
dominates-use invariants for metadata operands, resulting in IR like
this:
define void @foo(i32 %arg) {
call void @llvm.some.intrinsic(metadata i32 %x)
%x = add i32 1, i32 %arg
}
If the inliner chooses to inline @foo into another function, then
RemapInstruction will call `MapValue(metadata i32 %x)` and assert that
the return is not nullptr.
I've filed PR27273 to add a Verifier check and fix the underlying
problem in the optimization passes.
As a workaround, return `!{}` instead of nullptr for unmapped
LocalAsMetadata when RF_IgnoreMissingLocals is unset. Otherwise, match
the behaviour of r265631.
Original commit message:
ValueMapper: Make LocalAsMetadata match function-local Values
Start treating LocalAsMetadata similarly to function-local members of
the Value hierarchy in MapValue and MapMetadata.
- Don't memoize them.
- Return nullptr if they are missing.
This also cleans up ConstantAsMetadata to stop listening to the
RF_IgnoreMissingLocals flag.
llvm-svn: 265759
Diffstat (limited to 'llvm/test/Transforms')
-rw-r--r-- | llvm/test/Transforms/Inline/local-as-metadata-undominated-use.ll | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/llvm/test/Transforms/Inline/local-as-metadata-undominated-use.ll b/llvm/test/Transforms/Inline/local-as-metadata-undominated-use.ll new file mode 100644 index 00000000000..5182e2148dc --- /dev/null +++ b/llvm/test/Transforms/Inline/local-as-metadata-undominated-use.ll @@ -0,0 +1,49 @@ +; RUN: opt -inline -S < %s | FileCheck %s + +; Make sure the inliner doesn't crash when a metadata-bridged SSA operand is an +; undominated use. +; +; If we ever add a verifier check to prevent the scenario in this file, it's +; fine to delete this testcase. However, we would need a bitcode upgrade since +; such historical IR exists in practice. + +define i32 @foo(i32 %i) !dbg !4 { +entry: + tail call void @llvm.dbg.value(metadata i32 %add, i64 0, metadata !8, metadata !10), !dbg !11 + %add = add nsw i32 1, %i, !dbg !12 + ret i32 %add, !dbg !13 +} + +; CHECK-LABEL: define i32 @caller( +define i32 @caller(i32 %i) { +; CHECK-NEXT: entry: +entry: +; Although the inliner shouldn't crash, it can't be expected to get the +; "correct" SSA value since its assumptions have been violated. +; CHECK-NEXT: tail call void @llvm.dbg.value(metadata ![[EMPTY:[0-9]+]], +; CHECK-NEXT: %{{.*}} = add nsw + %call = tail call i32 @foo(i32 %i) + ret i32 %call +} + +declare void @llvm.dbg.value(metadata, i64, metadata, metadata) + +!llvm.dbg.cu = !{!0} +!llvm.module.flags = !{!9} + +!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 3.9.0 (trunk 265634) (llvm/trunk 265637)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, subprograms: !3) +!1 = !DIFile(filename: "t.c", directory: "/path/to/tests") + +; CHECK: ![[EMPTY]] = !{} +!2 = !{} +!3 = !{!4} +!4 = distinct !DISubprogram(name: "foo", scope: !1, file: !1, line: 2, type: !5, isLocal: false, isDefinition: true, scopeLine: 2, flags: DIFlagPrototyped, isOptimized: true) +!5 = !DISubroutineType(types: !6) +!6 = !{!7, !7} +!7 = !DIBasicType(name: "int", size: 32, align: 32, encoding: DW_ATE_signed) +!8 = !DILocalVariable(name: "add", arg: 1, scope: !4, file: !1, line: 2, type: !7) +!9 = !{i32 2, !"Debug Info Version", i32 3} +!10 = !DIExpression() +!11 = !DILocation(line: 2, column: 13, scope: !4) +!12 = !DILocation(line: 2, column: 27, scope: !4) +!13 = !DILocation(line: 2, column: 18, scope: !4) |