diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2019-01-20 11:41:25 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2019-01-20 11:41:25 +0000 |
| commit | d9484dd61cc151c4f34c31e07f693fefa66316b5 (patch) | |
| tree | ab0560b3da293f1fafd3269c59692e929418f5c2 /contrib/llvm/lib/Target/AMDGPU/Utils/AMDKernelCodeTInfo.h | |
| parent | 79e0962d4c3cf1f0acf359a9d69cb3ac68c414c4 (diff) | |
| parent | d8e91e46262bc44006913e6796843909f1ac7bcd (diff) | |
| download | src-d9484dd61cc151c4f34c31e07f693fefa66316b5.tar.gz src-d9484dd61cc151c4f34c31e07f693fefa66316b5.zip | |
Merge llvm trunk r351319, resolve conflicts, and update FREEBSD-Xlist.
Notes
Notes:
svn path=/projects/clang800-import/; revision=343210
Diffstat (limited to 'contrib/llvm/lib/Target/AMDGPU/Utils/AMDKernelCodeTInfo.h')
| -rw-r--r-- | contrib/llvm/lib/Target/AMDGPU/Utils/AMDKernelCodeTInfo.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/llvm/lib/Target/AMDGPU/Utils/AMDKernelCodeTInfo.h b/contrib/llvm/lib/Target/AMDGPU/Utils/AMDKernelCodeTInfo.h index 9f0a4d29b5e4..82ffdef8e674 100644 --- a/contrib/llvm/lib/Target/AMDGPU/Utils/AMDKernelCodeTInfo.h +++ b/contrib/llvm/lib/Target/AMDGPU/Utils/AMDKernelCodeTInfo.h @@ -46,6 +46,7 @@ int64_t Value = 0; \ if (!expectAbsExpression(MCParser, Value, Err)) \ return false; \ + C.compute_pgm_resource_registers &= ~(SetMacro(0xFFFFFFFFFFFFFFFFULL) << Shift); \ C.compute_pgm_resource_registers |= SetMacro(Value) << Shift; \ return true; \ } |