[LLD] Fix issue in HIP due to unspecified order of evaluation of the function object

This fixes the issue raised in https://reviews.llvm.org/D108850#3303452

Before C++17, the function object is evaluated in a unspecified order. In the following example: https://godbolt.org/z/8ao4vdsr7 the function object is either evaluated before or after the arguments, depending on the compiler. With MSVC and /std:c++14 the function object is evaluated after the arguments; with clang and gcc, it is evaluated before. With C++17, the function object is guaranteed to be evaluated before the arguments, see: https://riptutorial.com/cplusplus/example/19369/evaluation-order-of-function-arguments

In our case, the issue was that the `args` conversion to `ArrayRef` was evaluated before the lambda call `link`, which internally was calling `parseFlavor()`, which in turned modified `args`. We ended with an `ArrayRef` argument that reflected the previous contents of `args`.

Add coverage for `-flavor` which we didn't have before.

Differential Revision: https://reviews.llvm.org/D119278
This commit is contained in:
Alexandre Ganea 2022-02-08 17:39:13 -05:00
parent 1e661e583d
commit bb8be26a7e
2 changed files with 28 additions and 2 deletions

View File

@ -0,0 +1,26 @@
# REQUIRES: amdgpu
# RUN: llvm-mc -filetype=obj -triple amdgcn-amd-amdhsa -mcpu=gfx1031 --position-independent --relax-relocations %s -o %t.o
# We use lld-link on purpose to exercise -flavor.
# RUN: lld-link -flavor gnu -shared %t.o
.text
.amdgcn_target "amdgcn-amd-amdhsa--gfx1031"
.protected xxx ; @xxx
.type xxx,@object
.data
.globl xxx
xxx:
.long 123 ; 0x7b
.addrsig
.amdgpu_metadata
---
amdhsa.kernels: []
amdhsa.target: amdgcn-amd-amdhsa--gfx1031
amdhsa.version:
- 1
- 1
...
.end_amdgpu_metadata

View File

@ -159,9 +159,9 @@ static int lldMain(int argc, const char **argv, llvm::raw_ostream &stdoutOS,
die("lld is a generic driver.\n"
"Invoke ld.lld (Unix), ld64.lld (macOS), lld-link (Windows), wasm-ld"
" (WebAssembly) instead");
};
}();
// Run the driver. If an error occurs, false will be returned.
bool r = link()(args, stdoutOS, stderrOS, exitEarly, inTestOutputDisabled);
bool r = link(args, stdoutOS, stderrOS, exitEarly, inTestOutputDisabled);
// Call exit() if we can to avoid calling destructors.
if (exitEarly)