Issue #27628 - Also support the LLVM 3.6 IR format in two tests

[sylvestre]

No description provided.

[rust-highfive]

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @nikomatsakis (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. The way Github handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

[dotdash]

I think you need to escape the * in the regular expressions. I didn't think of that when I gave the example in #27628.

[sylvestre]

@dotdash I add the escape but it seems still unhappy. Does it ring a bell?

[dotdash]

The CHECK line in loads.rs has an extra % before the first i32, and the one in stores.rs works for me if I escape the asterisk. Here are the CHECK lines that work for me:

// CHECK: load {{(i32\*, )?}}i32** %x{{.*}}, !nonnull
// CHECK: [[VAR:%[0-9]+]] = load {{(\[4 x i8\]\*, )?}}[4 x i8]** %x

Edit: Oh great, not indenting the code made it hide the backslash. Sorry that I did not notice that earlier. Fixed that now :-/

[dotdash]

Sorry for all the trouble!

[sylvestre]

no worries, I will fix that tomorrow

[dotdash]

Btw, if you want to run the test against a pre-built rustc (e.g. a nightly that was built against LLVM 3.7) instead of bootstrapping it all yourself, this should do:

rustc --allow unused --crate-type=lib -Cno-prepopulate-passes --emit llvm-ir -o tmp.ll src/test/codegen/loads.rs && FileCheck-3.7 src/test/codegen/loads.rs < tmp.ll

If you don't get any output from that command, everything's fine.

Using FileCheck-3.6 should work just fine as well.

[sylvestre]

Looks like I pushed the wrong patch, sorry :/

[dotdash]

@bors r+ 0fdc4a8

Codegen tests already passed on Travis! Thanks a lot!

[bors]

⌛ Testing commit 0fdc4a8 with merge aca2057...

[bors]

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-x-android-t, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-win-gnu-32-nopt-t, auto-win-gnu-32-opt, auto-win-gnu-64-nopt-t, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-opt