mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2025-01-10 22:00:58 +00:00
Don't build switch lookup tables for dllimport or TLS variables
We would previously put dllimport variables in switch lookup tables, which doesn't work because the address cannot be used in a constant initializer. This is basically the same problem that we have in PR19955. Putting TLS variables in switch tables also desn't work, because the address of such a variable is not constant. Differential Revision: http://reviews.llvm.org/D4220 llvm-svn: 211331
This commit is contained in:
parent
b39185a826
commit
3869faa1a3
@ -71,6 +71,9 @@ public:
|
||||
/// isThreadDependent - Return true if the value can vary between threads.
|
||||
bool isThreadDependent() const;
|
||||
|
||||
/// Return true if the value is dependent on a dllimport variable.
|
||||
bool isDLLImportDependent() const;
|
||||
|
||||
/// isConstantUsed - Return true if the constant has users other than constant
|
||||
/// exprs and other dangling things.
|
||||
bool isConstantUsed() const;
|
||||
|
@ -278,35 +278,48 @@ bool Constant::canTrap() const {
|
||||
return canTrapImpl(this, NonTrappingOps);
|
||||
}
|
||||
|
||||
/// isThreadDependent - Return true if the value can vary between threads.
|
||||
bool Constant::isThreadDependent() const {
|
||||
SmallPtrSet<const Constant*, 64> Visited;
|
||||
SmallVector<const Constant*, 64> WorkList;
|
||||
WorkList.push_back(this);
|
||||
Visited.insert(this);
|
||||
/// Check if C contains a GlobalValue for which Predicate is true.
|
||||
static bool
|
||||
ConstHasGlobalValuePredicate(const Constant *C,
|
||||
bool (*Predicate)(const GlobalValue *)) {
|
||||
SmallPtrSet<const Constant *, 8> Visited;
|
||||
SmallVector<const Constant *, 8> WorkList;
|
||||
WorkList.push_back(C);
|
||||
Visited.insert(C);
|
||||
|
||||
while (!WorkList.empty()) {
|
||||
const Constant *C = WorkList.pop_back_val();
|
||||
|
||||
if (const GlobalVariable *GV = dyn_cast<GlobalVariable>(C)) {
|
||||
if (GV->isThreadLocal())
|
||||
const Constant *WorkItem = WorkList.pop_back_val();
|
||||
if (const auto *GV = dyn_cast<GlobalValue>(WorkItem))
|
||||
if (Predicate(GV))
|
||||
return true;
|
||||
}
|
||||
|
||||
for (unsigned I = 0, E = C->getNumOperands(); I != E; ++I) {
|
||||
const Constant *D = dyn_cast<Constant>(C->getOperand(I));
|
||||
if (!D)
|
||||
for (const Value *Op : WorkItem->operands()) {
|
||||
const Constant *ConstOp = dyn_cast<Constant>(Op);
|
||||
if (!ConstOp)
|
||||
continue;
|
||||
if (Visited.insert(D))
|
||||
WorkList.push_back(D);
|
||||
if (Visited.insert(ConstOp))
|
||||
WorkList.push_back(ConstOp);
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/// isConstantUsed - Return true if the constant has users other than constant
|
||||
/// exprs and other dangling things.
|
||||
/// Return true if the value can vary between threads.
|
||||
bool Constant::isThreadDependent() const {
|
||||
auto DLLImportPredicate = [](const GlobalValue *GV) {
|
||||
return GV->isThreadLocal();
|
||||
};
|
||||
return ConstHasGlobalValuePredicate(this, DLLImportPredicate);
|
||||
}
|
||||
|
||||
bool Constant::isDLLImportDependent() const {
|
||||
auto DLLImportPredicate = [](const GlobalValue *GV) {
|
||||
return GV->hasDLLImportStorageClass();
|
||||
};
|
||||
return ConstHasGlobalValuePredicate(this, DLLImportPredicate);
|
||||
}
|
||||
|
||||
/// Return true if the constant has users other than constant exprs and other
|
||||
/// dangling things.
|
||||
bool Constant::isConstantUsed() const {
|
||||
for (const User *U : users()) {
|
||||
const Constant *UC = dyn_cast<Constant>(U);
|
||||
|
@ -3313,6 +3313,10 @@ static bool ForwardSwitchConditionToPHI(SwitchInst *SI) {
|
||||
static bool ValidLookupTableConstant(Constant *C) {
|
||||
if (ConstantExpr *CE = dyn_cast<ConstantExpr>(C))
|
||||
return CE->isGEPWithNoNotionalOverIndexing();
|
||||
if (C->isThreadDependent())
|
||||
return false;
|
||||
if (C->isDLLImportDependent())
|
||||
return false;
|
||||
|
||||
return isa<ConstantFP>(C) ||
|
||||
isa<ConstantInt>(C) ||
|
||||
|
@ -918,3 +918,55 @@ return:
|
||||
; CHECK: switch i32
|
||||
; CHECK-NOT: @switch.table
|
||||
}
|
||||
|
||||
; Don't build tables for switches with TLS variables.
|
||||
@tls_a = thread_local global i32 0
|
||||
@tls_b = thread_local global i32 0
|
||||
@tls_c = thread_local global i32 0
|
||||
@tls_d = thread_local global i32 0
|
||||
define i32* @tls(i32 %x) {
|
||||
entry:
|
||||
switch i32 %x, label %sw.default [
|
||||
i32 0, label %return
|
||||
i32 1, label %sw.bb1
|
||||
i32 2, label %sw.bb2
|
||||
]
|
||||
sw.bb1:
|
||||
br label %return
|
||||
sw.bb2:
|
||||
br label %return
|
||||
sw.default:
|
||||
br label %return
|
||||
return:
|
||||
%retval.0 = phi i32* [ @tls_d, %sw.default ], [ @tls_c, %sw.bb2 ], [ @tls_b, %sw.bb1 ], [ @tls_a, %entry ]
|
||||
ret i32* %retval.0
|
||||
; CHECK-LABEL: @tls(
|
||||
; CHECK: switch i32
|
||||
; CHECK-NOT: @switch.table
|
||||
}
|
||||
|
||||
; Don't build tables for switches with dllimport variables.
|
||||
@dllimport_a = external dllimport global i32
|
||||
@dllimport_b = external dllimport global i32
|
||||
@dllimport_c = external dllimport global i32
|
||||
@dllimport_d = external dllimport global i32
|
||||
define i32* @dllimport(i32 %x) {
|
||||
entry:
|
||||
switch i32 %x, label %sw.default [
|
||||
i32 0, label %return
|
||||
i32 1, label %sw.bb1
|
||||
i32 2, label %sw.bb2
|
||||
]
|
||||
sw.bb1:
|
||||
br label %return
|
||||
sw.bb2:
|
||||
br label %return
|
||||
sw.default:
|
||||
br label %return
|
||||
return:
|
||||
%retval.0 = phi i32* [ @dllimport_d, %sw.default ], [ @dllimport_c, %sw.bb2 ], [ @dllimport_b, %sw.bb1 ], [ @dllimport_a, %entry ]
|
||||
ret i32* %retval.0
|
||||
; CHECK-LABEL: @dllimport(
|
||||
; CHECK: switch i32
|
||||
; CHECK-NOT: @switch.table
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user