RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2024-12-11 05:35:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[MC] Fix constant pools with DenseMap sentinel values

Browse Source 
The MC ConstantPool class uses a DenseMap to track generated constants, with
the int64_t value of the constant as the key. This fails when values of
0x7fffffffffffffff or 0x7ffffffffffffffe are inserted into the constant pool, as
these are sentinel values for DenseMap.

The fix is to use std::map instead, which doesn't use sentinel values.

Differential revision: https://reviews.llvm.org/D33667



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@304199 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Oliver Stannard 2017-05-30 09:37:11 +00:00
parent db736ce4a1
commit 94eec101b3
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/llvm/MC/ConstantPools.h
View File

@ -19,6 +19,7 @@
#include "llvm/ADT/SmallVector.h" #include "llvm/ADT/SmallVector.h"
#include "llvm/Support/SMLoc.h" #include "llvm/Support/SMLoc.h"
#include <cstdint> #include <cstdint>
#include <map>
namespace llvm { namespace llvm {
@ -44,7 +45,7 @@ struct ConstantPoolEntry {
class ConstantPool { class ConstantPool {
using EntryVecTy = SmallVector<ConstantPoolEntry, 4>; using EntryVecTy = SmallVector<ConstantPoolEntry, 4>;
EntryVecTy Entries; EntryVecTy Entries;
DenseMap<int64_t, const MCSymbolRefExpr *> CachedEntries; std::map<int64_t, const MCSymbolRefExpr *> CachedEntries;
public: public:
// Initialize a new empty constant pool // Initialize a new empty constant pool

12
test/MC/AArch64/ldr-pseudo.s
View File

@ -205,6 +205,13 @@ f18:
ldr x1, =0x320064 ldr x1, =0x320064
// CHECK: ldr x1, .Ltmp[[TMP26:[0-9]+]] // CHECK: ldr x1, .Ltmp[[TMP26:[0-9]+]]
// We previously used a DenseMap with constant values as keys, check that
// sentinel values can be used.
ldr x0, =0x7ffffffffffffffe
// CHECK: ldr x0, .Ltmp[[TMP27:[0-9]+]]
ldr x1, =0x7fffffffffffffff
// CHECK: ldr x1, .Ltmp[[TMP28:[0-9]+]]
// //
// Constant Pools // Constant Pools
// //
@ -311,3 +318,8 @@ f18:
// CHECK: .p2align 2 // CHECK: .p2align 2
// CHECK: .Ltmp[[TMP25]] // CHECK: .Ltmp[[TMP25]]
// CHECK: .word 3276900 // CHECK: .word 3276900
// CHECK: .Ltmp[[TMP27]]
// CHECK: .xword 9223372036854775806
// CHECK: .Ltmp[[TMP28]]
// CHECK: .xword 9223372036854775807