diff options
| author | bors <bors@rust-lang.org> | 2016-12-08 21:13:52 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-12-08 21:13:52 +0000 |
| commit | 97bfeadfd8eb4db591d9fb0fcfef7472d7480415 (patch) | |
| tree | a27b68ac8fb6db68f4ede0271280e1a3a77bf008 /src | |
| parent | 7537f953e2d28dc0f34ab39737b058e7b79a7fb7 (diff) | |
| parent | 9a3340a0486f0c38f38a8b3cd1b85b5645d28bf3 (diff) | |
| download | rust-97bfeadfd8eb4db591d9fb0fcfef7472d7480415.tar.gz rust-97bfeadfd8eb4db591d9fb0fcfef7472d7480415.zip | |
Auto merge of #38195 - rkruppe:llvm-pass-name-fwdcompat, r=alexcrichton
[LLVM 4.0] test/run-make/llvm-pass/ cc #37609
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/run-make/llvm-pass/llvm-function-pass.so.cc | 7 | ||||
| -rw-r--r-- | src/test/run-make/llvm-pass/llvm-module-pass.so.cc | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/test/run-make/llvm-pass/llvm-function-pass.so.cc b/src/test/run-make/llvm-pass/llvm-function-pass.so.cc index 4470c400760..880c9bce562 100644 --- a/src/test/run-make/llvm-pass/llvm-function-pass.so.cc +++ b/src/test/run-make/llvm-pass/llvm-function-pass.so.cc @@ -28,7 +28,12 @@ namespace { bool runOnFunction(Function &F) override; - const char *getPassName() const override { +#if LLVM_VERSION_MAJOR >= 4 + StringRef +#else + const char * +#endif + getPassName() const override { return "Some LLVM pass"; } diff --git a/src/test/run-make/llvm-pass/llvm-module-pass.so.cc b/src/test/run-make/llvm-pass/llvm-module-pass.so.cc index 510375a5e66..280eca7e8f0 100644 --- a/src/test/run-make/llvm-pass/llvm-module-pass.so.cc +++ b/src/test/run-make/llvm-pass/llvm-module-pass.so.cc @@ -27,7 +27,12 @@ namespace { bool runOnModule(Module &M) override; - const char *getPassName() const override { +#if LLVM_VERSION_MAJOR >= 4 + StringRef +#else + const char * +#endif + getPassName() const override { return "Some LLVM pass"; } |