diff options
| author | Vitaly Buka <vitalybuka@google.com> | 2018-08-20 19:31:03 +0000 |
|---|---|---|
| committer | Vitaly Buka <vitalybuka@google.com> | 2018-08-20 19:31:03 +0000 |
| commit | 30b5ed3eb7c08feeee2f6a022636c953e7bcf118 (patch) | |
| tree | 79a9d8ef45398d932f5f7af68736552a395318cf /llvm/lib | |
| parent | 94b9029be9f2cdfef7776c48a18a0117a5ea6fda (diff) | |
| download | bcm5719-llvm-30b5ed3eb7c08feeee2f6a022636c953e7bcf118.tar.gz bcm5719-llvm-30b5ed3eb7c08feeee2f6a022636c953e7bcf118.zip | |
Revert "AMDGPU: bump AS.MAX_COMMON_ADDRESS to 6 since 32-bit addr space"
As it introduces out of bound access.
This reverts commit r340172 and r340171
llvm-svn: 340202
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/Target/AMDGPU/AMDGPU.h | 2 | ||||
| -rw-r--r-- | llvm/lib/Target/AMDGPU/AMDGPUAliasAnalysis.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/Target/AMDGPU/AMDGPU.h b/llvm/lib/Target/AMDGPU/AMDGPU.h index 26580a86747..796766d9462 100644 --- a/llvm/lib/Target/AMDGPU/AMDGPU.h +++ b/llvm/lib/Target/AMDGPU/AMDGPU.h @@ -229,7 +229,7 @@ struct AMDGPUAS { enum : unsigned { // The maximum value for flat, generic, local, private, constant and region. - MAX_COMMON_ADDRESS = 6, + MAX_COMMON_ADDRESS = 5, GLOBAL_ADDRESS = 1, ///< Address space for global memory (RAT0, VTX0). CONSTANT_ADDRESS = 4, ///< Address space for constant memory (VTX2) diff --git a/llvm/lib/Target/AMDGPU/AMDGPUAliasAnalysis.cpp b/llvm/lib/Target/AMDGPU/AMDGPUAliasAnalysis.cpp index d3ff511cde5..ef4b69d09d9 100644 --- a/llvm/lib/Target/AMDGPU/AMDGPUAliasAnalysis.cpp +++ b/llvm/lib/Target/AMDGPU/AMDGPUAliasAnalysis.cpp @@ -69,7 +69,7 @@ AMDGPUAAResult::ASAliasRulesTy::ASAliasRulesTy(AMDGPUAS AS_, Triple::ArchType Ar /* Region */ {MayAlias, NoAlias , NoAlias , NoAlias, MayAlias, NoAlias}, /* Private */ {MayAlias, NoAlias , NoAlias , NoAlias , NoAlias , MayAlias} }; - static_assert(AMDGPUAS::MAX_COMMON_ADDRESS <= 6, "Addr space out of range"); + assert(AS.MAX_COMMON_ADDRESS <= 5); if (AS.FLAT_ADDRESS == 0) { assert(AS.GLOBAL_ADDRESS == 1 && AS.REGION_ADDRESS == 2 && |
