From 9e7e8839b2bb372fbe76703cc0702fa9a8404057 Mon Sep 17 00:00:00 2001 From: Adrian Prantl Date: Fri, 20 May 2016 20:36:06 +0000 Subject: dsymutil/modules: Reword the warning for static libraries without module caches In addition to clarifying the warning message this contains a minor functional change in that it now warns if the *immediate* parent directory in which the missing PCM is expected to be isn't found. This patch also includes a more comprehensive testcase. rdar://problem/25860711 llvm-svn: 270269 --- .../test/tools/dsymutil/Inputs/module-warnings/1.o | Bin 0 -> 2320 bytes .../tools/dsymutil/Inputs/module-warnings/Bar.pcm | Bin 0 -> 17220 bytes .../tools/dsymutil/Inputs/module-warnings/Foo.pcm | Bin 0 -> 17588 bytes .../dsymutil/Inputs/module-warnings/libstatic.a | Bin 0 -> 2504 bytes .../test/tools/dsymutil/Inputs/modules/libstatic.a | Bin 2632 -> 0 bytes llvm/test/tools/dsymutil/X86/module-warnings.test | 53 +++++++++++++++++++++ llvm/test/tools/dsymutil/X86/modules-warnings.test | 26 ---------- 7 files changed, 53 insertions(+), 26 deletions(-) create mode 100644 llvm/test/tools/dsymutil/Inputs/module-warnings/1.o create mode 100644 llvm/test/tools/dsymutil/Inputs/module-warnings/Bar.pcm create mode 100644 llvm/test/tools/dsymutil/Inputs/module-warnings/Foo.pcm create mode 100644 llvm/test/tools/dsymutil/Inputs/module-warnings/libstatic.a delete mode 100644 llvm/test/tools/dsymutil/Inputs/modules/libstatic.a create mode 100644 llvm/test/tools/dsymutil/X86/module-warnings.test delete mode 100644 llvm/test/tools/dsymutil/X86/modules-warnings.test (limited to 'llvm/test') diff --git a/llvm/test/tools/dsymutil/Inputs/module-warnings/1.o b/llvm/test/tools/dsymutil/Inputs/module-warnings/1.o new file mode 100644 index 00000000000..73531e27855 Binary files /dev/null and b/llvm/test/tools/dsymutil/Inputs/module-warnings/1.o differ diff --git a/llvm/test/tools/dsymutil/Inputs/module-warnings/Bar.pcm b/llvm/test/tools/dsymutil/Inputs/module-warnings/Bar.pcm new file mode 100644 index 00000000000..fdd8f8c7ffb Binary files /dev/null and b/llvm/test/tools/dsymutil/Inputs/module-warnings/Bar.pcm differ diff --git a/llvm/test/tools/dsymutil/Inputs/module-warnings/Foo.pcm b/llvm/test/tools/dsymutil/Inputs/module-warnings/Foo.pcm new file mode 100644 index 00000000000..2b1ca6f1ae1 Binary files /dev/null and b/llvm/test/tools/dsymutil/Inputs/module-warnings/Foo.pcm differ diff --git a/llvm/test/tools/dsymutil/Inputs/module-warnings/libstatic.a b/llvm/test/tools/dsymutil/Inputs/module-warnings/libstatic.a new file mode 100644 index 00000000000..48f161853ab Binary files /dev/null and b/llvm/test/tools/dsymutil/Inputs/module-warnings/libstatic.a differ diff --git a/llvm/test/tools/dsymutil/Inputs/modules/libstatic.a b/llvm/test/tools/dsymutil/Inputs/modules/libstatic.a deleted file mode 100644 index 46e79a5dd94..00000000000 Binary files a/llvm/test/tools/dsymutil/Inputs/modules/libstatic.a and /dev/null differ diff --git a/llvm/test/tools/dsymutil/X86/module-warnings.test b/llvm/test/tools/dsymutil/X86/module-warnings.test new file mode 100644 index 00000000000..3240a265058 --- /dev/null +++ b/llvm/test/tools/dsymutil/X86/module-warnings.test @@ -0,0 +1,53 @@ +# Compile with: +# cat >modules.modulemap <Bar.h +# echo '@import Bar; typedef bar foo;' >Foo.h +# echo '@import Foo; foo f() { return 0; }' >module-warnings.m +# clang -cc1 -emit-obj -fmodules -fmodule-map-file=modules.modulemap \ +# -fmodule-format=obj -debug-info-kind=standalone -dwarf-ext-refs \ +# -fmodules-cache-path=ModuleCache \ +# -fdisable-module-hash module-warnings.m -o 1.o +# +# Test for module-related warnings. +# +# RUN: rm -rf %t.dir && mkdir %t.dir && mkdir %t.dir/ModuleCache +# RUN: cp %p/../Inputs/module-warnings/1.o %t.dir +# RUN: cp %p/../Inputs/module-warnings/Foo.pcm %t.dir/ModuleCache +# +# RUN: llvm-dsymutil -f -oso-prepend-path=%t.dir -y \ +# RUN: %p/dummy-debug-map.map -o %t 2>&1 | FileCheck %s +# +# Module-not-found should be reported only once. +# The exact error message depends on the OS so we don't check for it. +# CHECK: warning: {{.*}}Bar.pcm: +# CHECK-NOT: warning: {{.*}}Bar.pcm: +# +# RUN: cp %p/../Inputs/module-warnings/libstatic.a %t.dir +# RUN: llvm-dsymutil -f -oso-prepend-path=%t.dir -y %s -o %t 2>&1 | FileCheck %s +# CHECK: rebuild the module cache +# CHECK-NOT: static libraries +# +# RUN: rm -rf %t.dir/ModuleCache +# RUN: llvm-dsymutil -f -oso-prepend-path=%t.dir -y %s -o %t 2>&1 \ +# RUN: | FileCheck %s --check-prefix=STATIC +# STATIC: warning: {{.*}}Bar.pcm: +# STATIC: note: Linking a static library +# STATIC: warning: {{.*}}Foo.pcm: +# STATIC-NOT: note: + +--- +triple: 'x86_64-apple-darwin' +objects: + - filename: libstatic.a(1.o) + symbols: + - { sym: __Z3foov, objAddr: 0x0, binAddr: 0x10000, size: 0x10 } +... diff --git a/llvm/test/tools/dsymutil/X86/modules-warnings.test b/llvm/test/tools/dsymutil/X86/modules-warnings.test deleted file mode 100644 index 35538d60bb1..00000000000 --- a/llvm/test/tools/dsymutil/X86/modules-warnings.test +++ /dev/null @@ -1,26 +0,0 @@ -# Test for module-related warnings. -# This reuses the inputs from the modules.m testcase. -# -# RUN: rm -rf %t.dir && mkdir %t.dir -# RUN: cp %p/../Inputs/modules/1.o %p/../Inputs/modules/Foo.pcm %t.dir -# -# RUN: llvm-dsymutil -f -oso-prepend-path=%t.dir -y \ -# RUN: %p/dummy-debug-map.map -o %t 2>&1 | FileCheck %s -# -# Module-not-found should be reported only once. -# The exact error message depends on the OS so we don't check for it. -# CHECK: warning: {{.*}}Bar.pcm: -# CHECK-NOT: warning: {{.*}}Bar.pcm: -# -# RUN: cp %p/../Inputs/modules/libstatic.a %t.dir -# RUN: llvm-dsymutil -f -oso-prepend-path=%t.dir -y %s -o %t 2>&1 | FileCheck %s -# CHECK: rebuild the module cache -# CHECK-NOT: static libraries - ---- -triple: 'x86_64-apple-darwin' -objects: - - filename: libstatic.a(1.o) - symbols: - - { sym: __Z3foov, objAddr: 0x0, binAddr: 0x10000, size: 0x10 } -... -- cgit v1.2.3